minor changes

open768 · Feb 22, 2022 · f344b77 · f344b77
1 parent 01b67e6
commit f344b77
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/pages/audit/audit.php b/pages/audit/audit.php
@@ -41,6 +41,13 @@
 		cRenderCards::action_start();
 			//TODO add a calender to pick audit events from different days
 			cRender::button("Back to actions list", "audit.php");
+			if ($sType === cRenderQS::AUDIT_TYPE_ACTION)
+				switch ( $sFilter){
+					case cRenderQS::AUDIT_FILTER_LOGIN:
+					case cRenderQS::AUDIT_FILTER_LOGIN_FAILED:
+					case cRenderQS::AUDIT_FILTER_LOGOUT:
+						cRender::button("Users", "../all/allusers.php");
+				}
 		cRenderCards::action_end();
 	cRenderCards::card_end();
 }

diff --git a/pages/trans/apptrans.php b/pages/trans/apptrans.php
@@ -23,10 +23,18 @@
 // common functions
 //####################################################################
 //get passed in values
-$oApp = cRenderObjs::get_current_app();
-$gsAppQS = cRenderQS::get_base_app_QS($oApp);
+try{
+	$moTier = cRenderObjs::get_current_tier();
+	$moApp = $oTier->app;
+}catch (Exception e){
+	$moTier = null;
+	$moApp = cRenderObjs::get_current_app();
+}
+
+$gsAppQS = cRenderQS::get_base_app_QS($moApp);
 
-cRenderHtml::header("Transactions for $oApp->name");
+
+cRenderHtml::header("Transactions for $moApp->name");
 cRender::force_login();
 
 //********************************************************************
@@ -45,7 +53,7 @@
 cRenderCards::body_end();
 cRenderCards::action_start();
 	cRenderMenus::show_apps_menu("Change Application");
-	cADCommon::button(cADControllerUI::businessTransactions($oApp));
+	cADCommon::button(cADControllerUI::businessTransactions($moApp));
 	$sUrl = cHttp::build_url("config.php", $gsAppQS);
 	cRender::button("config", $sUrl);
 
@@ -58,17 +66,15 @@
 cRenderCards::card_end();
 
 //####################################################################
-$aTiers =$oApp->GET_Tiers();
-foreach ( $aTiers as $oTier){
-	$oTier->app = $oApp;
-
+function tier_card($poTier){
+	global $moApp;
 	//get the transaction names for the Tier
 	cRenderCards::card_start();
 		cRenderCards::body_start();
 			?><div 
 				type="adtiertrans" 
 				home="<?=$home?>" 
-				<?=cRenderQS::APP_ID_QS?>="<?=$oApp->id?>" 
+				<?=cRenderQS::APP_ID_QS?>="<?=$moApp->id?>" 
 				<?=cRenderQS::TIER_ID_QS?>="<?=$oTier->id?>">please wait...</div><?php
 		cRenderCards::body_end();
 		cRenderCards::action_start();
@@ -81,6 +87,17 @@
 		cRenderCards::action_end();
 	cRenderCards::card_end();
 }
+
+if ($moTier){
+	tier_card($moTier);
+}else{
+	$aTiers =$moApp->GET_Tiers();
+	foreach ( $aTiers as $oTier){
+		$oTier->app = $moApp;
+		tier_card($oTier);
+	}
+}
+
 ?>
 
 <script language="javascript">