|
|
@@ -478,6 +478,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
$tabindex = 0;
|
|
|
foreach ($fieldsList as $kID => $vCol) {
|
|
|
$fieldName = $vCol['name'];
|
|
|
+ $fieldLabel = str_replace('<br>', ' ', $vCol['label']);
|
|
|
DBG::log(['$fieldName'=>$fieldName, 'canCreate'=>$acl->canCreateField($fieldName)], 'array', "form field");
|
|
|
if ($acl->canCreateField($fieldName)) {
|
|
|
DBG::log("editFormJson::field({$fieldName})");
|
|
|
@@ -486,7 +487,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
|
|
|
$jsFields[] = [ 'div', [ 'class' => "form-group" ], [
|
|
|
[ 'label', [ 'class' => "control-label", 'for' => "f{$kID}" ], [
|
|
|
- [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $vCol['label'] ],
|
|
|
+ [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $fieldLabel ],
|
|
|
[ 'i', [ 'class' => "glyphicon glyphicon-info-sign frm-help", 'data-toggle' => "popover", 'data-trigger' => "hover", 'title' => "", 'data-content' => htmlspecialchars($vCol['opis']), 'data-original-title' => "[{$kID}] {$fieldName}" ] ],
|
|
|
] ],
|
|
|
[ 'div', [ 'class' => "" ], [
|
|
|
@@ -686,6 +687,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
$tabindex = 0;
|
|
|
foreach ($fieldsList as $kID => $vCol) {
|
|
|
$fieldName = $vCol['name'];
|
|
|
+ $fieldLabel = str_replace('<br>', ' ', $vCol['label']);
|
|
|
DBG::log(['$fieldName'=>$fieldName, '$record'=>$record, 'canWrite'=>$acl->canWriteObjectField($fieldName, $record), 'canRead'=>$acl->canReadObjectField($fieldName, $record)], 'array', "form field");
|
|
|
if ($acl->canWriteObjectField($fieldName, $record)) {
|
|
|
DBG::log("editFormJson::field({$fieldName})");
|
|
|
@@ -694,7 +696,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
|
|
|
$jsFields[] = [ 'div', [ 'class' => "form-group" ], [
|
|
|
[ 'label', [ 'class' => "control-label", 'for' => "f{$kID}" ], [
|
|
|
- [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $vCol['label'] ],
|
|
|
+ [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $fieldLabel ],
|
|
|
[ 'i', [ 'class' => "glyphicon glyphicon-info-sign frm-help", 'data-toggle' => "popover", 'data-trigger' => "hover", 'title' => "", 'data-content' => htmlspecialchars($vCol['opis']), 'data-original-title' => "[{$kID}] {$fieldName}" ] ],
|
|
|
] ],
|
|
|
[ 'div', [ 'class' => "" ], [
|
|
|
@@ -704,7 +706,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
} else if ($acl->canReadObjectField($fieldName, $record)) {
|
|
|
$jsFields[] = [ 'div', [ 'class' => "form-group" ], [
|
|
|
[ 'label', [ 'class' => "control-label", 'for' => "f{$kID}" ], [
|
|
|
- [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $vCol['label']],
|
|
|
+ [ 'span', [ 'style' => ['padding-right'=>'4px'] ], $fieldLabel ],
|
|
|
[ 'i', [ 'class' => "glyphicon glyphicon-info-sign frm-help", 'data-toggle' => "popover", 'data-trigger' => "hover", 'title' => "", 'data-content' => htmlspecialchars($vCol['opis']), 'data-original-title' => "[{$kID}] {$fieldName}" ] ],
|
|
|
] ],
|
|
|
[ 'div', [ 'class' => "" ], [
|