application: Only show submitter column when processing queued entries
This commit is contained in:
committed by
Chris Morgan
parent
709e418722
commit
cc03e17937
@@ -1030,10 +1030,13 @@ class Application {
|
||||
return array('submitTime', 'appName', 'appId', 'userName', 'vendorName');
|
||||
}
|
||||
|
||||
public static function objectGetHeader()
|
||||
public static function objectGetHeader($sState)
|
||||
{
|
||||
$oTableRow = new TableRowSortable();
|
||||
$oTableRow->AddSortableTextCell('Submission Date', 'submitTime');
|
||||
|
||||
/* Only show submitter when processing queued entries */
|
||||
if($sState != 'accepted')
|
||||
$oTableRow->AddTextCell('Submitter');
|
||||
$oTableRow->AddSortableTextCell('Vendor', 'vendorName');
|
||||
$oTableRow->AddSortableTextCell('Application', 'appName');
|
||||
@@ -1049,6 +1052,9 @@ class Application {
|
||||
|
||||
$oTableRow = new TableRow();
|
||||
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
|
||||
|
||||
/* Only show submitter when processing queued entries */
|
||||
if($this->sState != 'accepted')
|
||||
$oTableRow->AddTextCell($oUser->objectMakeLink());
|
||||
$oTableRow->AddTextCell($sVendor);
|
||||
$oTableRow->AddTextCell(($this->sState == 'accepted') ? $this->objectMakeLink() : $this->sName);
|
||||
|
||||
@@ -400,9 +400,9 @@ class application_queue
|
||||
return application::objectGetSortableFields();
|
||||
}
|
||||
|
||||
function objectGetHeader()
|
||||
function objectGetHeader($sState)
|
||||
{
|
||||
return $this->oApp->objectGetHeader();
|
||||
return $this->oApp->objectGetHeader($sState);
|
||||
}
|
||||
|
||||
function objectGetTableRow()
|
||||
|
||||
@@ -1315,7 +1315,7 @@ class ObjectManager
|
||||
private function outputHeader($sClass)
|
||||
{
|
||||
$oObject = new $this->sClass();
|
||||
$oTableRow = $oObject->objectGetHeader();
|
||||
$oTableRow = $oObject->objectGetHeader($this->sState);
|
||||
|
||||
/* Add an action column if the user can edit this class, or if it is a queue.
|
||||
Even though a user annot process items, he can edit his queued submissions */
|
||||
|
||||
Reference in New Issue
Block a user