Преглед изворни кода

fixed object inline edit in TableAjax

Piotr Labudda пре 8 година
родитељ
комит
eef75a3850
2 измењених фајлова са 5 додато и 7 уклоњено
  1. 3 3
      SE/se-lib/AntAclBase.php
  2. 2 4
      SE/se-lib/TableAjax.php

+ 3 - 3
SE/se-lib/AntAclBase.php

@@ -372,10 +372,10 @@ class AntAclBase extends Core_AclBase {
 			if ('A_RECORD_UPDATE_AUTHOR' === $fieldName) return true;
 			if ($this->getPrimaryKeyField() === $fieldName) return true;
 			$fieldAclInfo = $this->getAclInfo($fieldName);
-			DBG::log([$fieldAclInfo, 'V' => ($fieldAclInfo['PERM_V'] > 0), 'R'=>($fieldAclInfo['PERM_R'] > 0 && $this->canReadRecord($record)), 'O'=>($fieldAclInfo['PERM_O'] > 0 && $this->canReadRecord($record))], 'array', "AntAclBase: canWriteObjectField({$fieldName})...");
+			DBG::log([$fieldAclInfo, 'V' => ($fieldAclInfo['PERM_V'] > 0), 'R'=>($fieldAclInfo['PERM_R'] > 0 && $this->canReadRecord($object)), 'O'=>($fieldAclInfo['PERM_O'] > 0 && $this->canReadRecord($object))], 'array', "AntAclBase: canWriteObjectField({$fieldName})...");
 			if ($fieldAclInfo['PERM_V'] > 0) return true;
-			if ($fieldAclInfo['PERM_R'] > 0 && $this->canReadRecord($record)) return true;
-			if ($fieldAclInfo['PERM_O'] > 0 && $this->canReadRecord($record)) return true;
+			if ($fieldAclInfo['PERM_R'] > 0 && $this->canReadRecord($object)) return true;
+			if ($fieldAclInfo['PERM_O'] > 0 && $this->canReadRecord($object)) return true;
 		} catch (Exception $e) {
 			DBG::log($e);
 		}

+ 2 - 4
SE/se-lib/TableAjax.php

@@ -820,15 +820,13 @@ class TableAjax extends ViewAjax {
 		$vDefault = $this->_acl->getFieldDefaultValue($fieldName);
 		if (!empty($vDefault)) $fieldParams['default'] = $vDefault;
 		if (!empty($vDefault)) $response['defaultValue'] = $vDefault;
-		{
+		if (method_exists($this->_acl, 'getFormItem')) {
 			try {
 				$item = $this->_acl->getFormItem('W', $fieldID, "f{$fieldID}", $fieldVal, $fieldParams, $record);
 				$response['formItem'] = $item;
 				if (!empty($item['rawColType']['simpleType'])) $response['simpleType'] = $item['rawColType']['simpleType'];
 				if (!empty($item['rawColType']['restrictions'])) $response['restrictions'] = $item['rawColType']['restrictions'];
-				echo '<div style="display:none">';
-				DBG::_(true, true, "item", $item, __CLASS__, __FUNCTION__, __LINE__);
-				echo '</div>';
+				DBG::log($item, 'array', "\$item (Acl->getFormItem)");
 			} catch (Exception $e) {
 				echo '<div style="display:none">';
 				UI::alert('danger', $e->getMessage());