diff --git a/portal/index.php b/portal/index.php index 55ef4d2b51..6c13d7af0e 100644 --- a/portal/index.php +++ b/portal/index.php @@ -548,7 +548,7 @@ function ListResolvedRequests(WebPage $oP) * @param UserRequest $oRequest The object to display * @return void */ -function DisplayRequestDetails($oP, UserRequest $oRequest) +function DisplayRequestDetails($oP, UserRequest $oRequest, $bEditMode = true) { // Identical to the standard 'details' ZList of UserRequest, except that the field 'org_id' has been removed $aList = array( @@ -656,19 +656,29 @@ function DisplayRequestDetails($oP, UserRequest $oRequest) $oP->Details($aDetails); // Case log... editable so that users can post comments - $oP->add("
\n"); - $oP->add("GetKey()."\">"); - $oP->add(""); - $oP->add("\n"); - $oP->add(""); - $oP->add('
'.MetaModel::GetLabel('UserRequest', 'ticket_log').''); - $oAttDef = MetaModel::GetAttributeDef(get_class($oRequest), 'ticket_log'); - $oValue = $oRequest->Get('ticket_log'); - $oP->add($oRequest->GetFormElementForField($oP, get_class($oRequest), 'ticket_log', $oAttDef, $oValue, $sDisplayValue = '', $iId = 'att_ticket_log')); - //$oP->add(GetFieldAsHtml($oRequest, 'ticket_log')); - $oP->add('
'); - $oP->p(''); - $oP->add('
'); + if ($bEditMode) + { + $oP->add("
\n"); + $oP->add("GetKey()."\">"); + $oP->add(""); + $oP->add("\n"); + $oP->add(""); + $oP->add('
'.MetaModel::GetLabel('UserRequest', 'ticket_log').''); + $oAttDef = MetaModel::GetAttributeDef(get_class($oRequest), 'ticket_log'); + $oValue = $oRequest->Get('ticket_log'); + $oP->add($oRequest->GetFormElementForField($oP, get_class($oRequest), 'ticket_log', $oAttDef, $oValue, $sDisplayValue = '', $iId = 'att_ticket_log')); + //$oP->add(GetFieldAsHtml($oRequest, 'ticket_log')); + $oP->add('
'); + $oP->p(''); + $oP->add('
'); + } + else + { + $oP->add('
'.MetaModel::GetLabel('UserRequest', 'ticket_log').''); + $oP->add(GetFieldAsHtml($oRequest, 'ticket_log')); + $oP->add('
'); + + } $oP->add(''); } @@ -682,10 +692,6 @@ function DisplayResolvedRequestForm($oP, UserRequest $oRequest) { $oP->add("
\n"); $oP->add("
\n"); - $oP->add('
'); - $oP->add("

".Dict::Format('Portal:TitleRequestDetailsFor_Request', $oRequest->GetName())."

\n"); - DisplayRequestDetails($oP, $oRequest); - $oP->add('
'); $aArgs = array('this' => $oRequest); $sClass = get_class($oRequest); @@ -720,9 +726,11 @@ function DisplayResolvedRequestForm($oP, UserRequest $oRequest) $oP->add("\n"); $oP->add(""); $oP->p(""); - $oP->add('
'); $oP->add("
"); $oP->add("
\n"); + $oP->add("

".Dict::Format('Portal:TitleRequestDetailsFor_Request', $oRequest->GetName())."

\n"); + DisplayRequestDetails($oP, $oRequest, false /* bEditMode */); + $oP->add_ready_script( <<