Merge branch '483-cmb-agent-s-name-in-open-and-view-all' into '472-cmb-release'
Add agent name to the view all and view open JO pages. #483 See merge request jankstudio/resq!567
This commit is contained in:
commit
5185043934
3 changed files with 8 additions and 8 deletions
|
|
@ -223,11 +223,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
$row['date_start'] = $date_start;
|
||||
$row['date_finish'] = $date_finish;
|
||||
|
||||
$processor = $orow->getProcessedBy();
|
||||
if ($processor == null)
|
||||
$row['processor'] = '';
|
||||
$creator = $orow->getCreatedBy();
|
||||
if ($creator == null)
|
||||
$row['creator'] = '';
|
||||
else
|
||||
$row['processor'] = $orow->getProcessedBy()->getFullName();
|
||||
$row['creator'] = $orow->getCreatedBy()->getFullName();
|
||||
|
||||
$assignor = $orow->getAssignedBy();
|
||||
if ($assignor == null)
|
||||
|
|
|
|||
|
|
@ -157,8 +157,8 @@
|
|||
title: 'Status'
|
||||
},
|
||||
{
|
||||
field: 'processor',
|
||||
title: 'Dispatcher'
|
||||
field: 'creator',
|
||||
title: 'Agent'
|
||||
},
|
||||
{
|
||||
field: 'Actions',
|
||||
|
|
|
|||
|
|
@ -152,8 +152,8 @@
|
|||
title: 'Status'
|
||||
},
|
||||
{
|
||||
field: 'processor',
|
||||
title: 'Dispatcher'
|
||||
field: 'creator',
|
||||
title: 'Agent'
|
||||
},
|
||||
{
|
||||
field: 'Actions',
|
||||
|
|
|
|||
Loading…
Reference in a new issue