claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: Only show submitter column when processing queued entries

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2008-06-13 00:03:58 +02:00
committed by Chris Morgan
parent 709e418722
commit cc03e17937
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/application.php
View File

@@ -1030,11 +1030,14 @@ class Application {
return array('submitTime', 'appName', 'appId', 'userName', 'vendorName'); return array('submitTime', 'appName', 'appId', 'userName', 'vendorName');
} }
public static function objectGetHeader() public static function objectGetHeader($sState)
{ {
$oTableRow = new TableRowSortable(); $oTableRow = new TableRowSortable();
$oTableRow->AddSortableTextCell('Submission Date', 'submitTime'); $oTableRow->AddSortableTextCell('Submission Date', 'submitTime');
$oTableRow->AddTextCell('Submitter');
/* Only show submitter when processing queued entries */
if($sState != 'accepted')
$oTableRow->AddTextCell('Submitter');
$oTableRow->AddSortableTextCell('Vendor', 'vendorName'); $oTableRow->AddSortableTextCell('Vendor', 'vendorName');
$oTableRow->AddSortableTextCell('Application', 'appName'); $oTableRow->AddSortableTextCell('Application', 'appName');
return $oTableRow; return $oTableRow;
@@ -1049,7 +1052,10 @@ class Application {
$oTableRow = new TableRow(); $oTableRow = new TableRow();
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))); $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell($oUser->objectMakeLink());
/* Only show submitter when processing queued entries */
if($this->sState != 'accepted')
$oTableRow->AddTextCell($oUser->objectMakeLink());
$oTableRow->AddTextCell($sVendor); $oTableRow->AddTextCell($sVendor);
$oTableRow->AddTextCell(($this->sState == 'accepted') ? $this->objectMakeLink() : $this->sName); $oTableRow->AddTextCell(($this->sState == 'accepted') ? $this->objectMakeLink() : $this->sName);

4
include/application_queue.php
View File

@@ -400,9 +400,9 @@ class application_queue
return application::objectGetSortableFields(); return application::objectGetSortableFields();
} }
function objectGetHeader() function objectGetHeader($sState)
{ {
return $this->oApp->objectGetHeader(); return $this->oApp->objectGetHeader($sState);
} }
function objectGetTableRow() function objectGetTableRow()

2
include/objectManager.php
View File

@@ -1315,7 +1315,7 @@ class ObjectManager
private function outputHeader($sClass) private function outputHeader($sClass)
{ {
$oObject = new $this->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. /* 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 */ Even though a user annot process items, he can edit his queued submissions */