Merge branch '804-add-checking-for-null-user-for-rejection-detail-report' into 'master'
Resolve "Add checking for null user for rejection detail report" Closes #804 See merge request jankstudio/resq!917
This commit is contained in:
commit
e83de164c1
1 changed files with 5 additions and 1 deletions
|
|
@ -236,6 +236,10 @@ class ReportController extends Controller
|
|||
|
||||
$reason = $jor->getReason();
|
||||
|
||||
$dispatched_by = 'system';
|
||||
if ($jor->getUser() != null)
|
||||
$dispatched_by = $jor->getUser()->getFullName();
|
||||
|
||||
$res[] = [
|
||||
$jo->getID(),
|
||||
$jo->getDateSchedule()->format('m/d/Y H:i'),
|
||||
|
|
@ -244,7 +248,7 @@ class ReportController extends Controller
|
|||
JORejectionReason::getName($jor->getReason()),
|
||||
$jor->getContactPerson(),
|
||||
$jor->getRemarks(),
|
||||
$jor->getUser()->getFullName(),
|
||||
$dispatched_by,
|
||||
ServiceType::getName($jo->getServiceType()),
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue