1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-22 14:13:03 +02:00

Admin-UI PHP Notice fixes.

This commit is contained in:
Cameron
2016-05-15 15:04:25 -07:00
parent 8ebb804f60
commit b8f7c5458d

View File

@@ -2102,6 +2102,9 @@ class e_admin_controller
$this->addTitle(); $this->addTitle();
} }
// e107::getDebug()->log("Admin-ui Action: <b>".$action."</b>");
if($action == 'Edit') if($action == 'Edit')
{ {
$this->addTitle('#'.$this->getId()); // Inform user of which record is being edited. $this->addTitle('#'.$this->getId()); // Inform user of which record is being edited.
@@ -3918,6 +3921,9 @@ class e_admin_controller_ui extends e_admin_controller
'search' => $searchQry, 'search' => $searchQry,
'tableFromName' => $tableFrom, 'tableFromName' => $tableFrom,
); );
$orderField = $request->getQuery('field', $this->getDefaultOrderField());
$rawData['tableFrom'] = $tableSFieldsArr; $rawData['tableFrom'] = $tableSFieldsArr;
$rawData['joinsFrom'] = $tableSJoinArr; $rawData['joinsFrom'] = $tableSJoinArr;
$rawData['joins'] = $joins; $rawData['joins'] = $joins;
@@ -4069,7 +4075,7 @@ class e_admin_controller_ui extends e_admin_controller
// Trigger Admin-ui event. 'pre' // Trigger Admin-ui event. 'pre'
if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit'])) // 'create' or 'update'; if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit'])) // 'create' or 'update';
{ {
$id = $model->getId();
$eventData = array('newData'=>$_posted,'oldData'=>$old_data,'id'=> $id); $eventData = array('newData'=>$_posted,'oldData'=>$old_data,'id'=> $id);
$model->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b>'); $model->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b>');
if(E107_DBG_ALLERRORS >0 ) if(E107_DBG_ALLERRORS >0 )
@@ -5740,7 +5746,7 @@ class e_admin_form_ui extends e_form
function getSettings() function getSettings()
{ {
$controller = $this->getController(); $controller = $this->getController();
$request = $controller->getRequest(); // $request = $controller->getRequest();
$legend = LAN_UI_PREF_LABEL; $legend = LAN_UI_PREF_LABEL;
$forms = $models = array(); $forms = $models = array();
$forms[] = array( $forms[] = array(