Ticket #4558 - Build-in API support: Grids.

modules/base/text/classes/BxBaseModTextGridAdministration.php

@@ -124,10 +124,12 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
     protected function _getFilterControlsAPI($aFilters = [])
     {
         $aFilters = [
-            $this->_sFilter1Name => [],
-            $this->_sFilter2Name => []
+            $this->_sFilter1Name => []
         ];
 
+        if(!empty($this->_sFilter2Name))
+            $aFilters[$this->_sFilter2Name] = [];
+
         return parent::_getFilterControlsAPI($aFilters);
     }
 

modules/boonex/artificer/data/template/system/css/page_layouts.css

@@ -1,28 +0,0 @@
-/*--
-import url(../../../../../../../template/css/page_layouts.css);
---*/
-
-
-/* common styles */
-.bx-layout-row.bx-lr-dump {
-    display: block;
-}
-.bx-layout-row.bx-lr-dump .adm-bp-cell {
-    margin-top: 0;
-    margin-bottom: 0;
-    border-style: dashed;
-}
-
-/* menu visibility */
-.bx-layout-column-thin .bx-def-thin-col-hide{
-    display: none;
-}
-.bx-layout-column-half .bx-def-half-col-hide{
-    display: none;
-}
-.bx-layout-column-wide .bx-def-wide-col-hide{
-    display: none;
-}
-.bx-layout-column-full .bx-def-full-col-hide{
-    display: none;
-}

template/scripts/BxBaseGrid.php

@@ -349,28 +349,25 @@ class BxBaseGrid extends BxDolGrid
 
     public function decodeDataAPI($aData)
     {
+        $sKeyId = $this->_aOptions['field_id'];
+        $sMethodDefault = '_getCellDefault';
+
         $aDataRv = [];
         foreach($aData as $iKey => $aRow) {
-            $aDataRv[$iKey] = [];
-            foreach($this->_aOptions['fields'] as $sKey => $aField){
-                $aDataRv[$iKey]['id'] = $aData[$iKey]['id'];
-                $sMethod = '_getCellDefault';
-                $sCustomMethod = '_getCell' . $this->_genMethodName($sKey);
-               
-                if (method_exists($this, $sCustomMethod)){
-                    $sMethod = $sCustomMethod;
-                    $s = $this->$sMethod($aData[$iKey][$sKey], $sKey, $aField, $aRow);
-                    $aDataRv[$iKey][$sKey] = $s;
-                }
-                else{
-                    $aDataRv[$iKey][$sKey] = ['type' => 'text', 'value'=> $aData[$iKey][$sKey]];    
-                }
-               
+            $aDataRv[$iKey] = [$sKeyId => $aData[$iKey][$sKeyId]];
+
+            foreach($this->_aOptions['fields'] as $sKey => $aField) {
+                $sMethod = '_getCell' . $this->_genMethodName($sKey);
+                if(!method_exists($this, $sMethod))
+                    $sMethod = $sMethodDefault;
+
+                $aDataRv[$iKey][$sKey] = $this->$sMethod(isset($aData[$iKey][$sKey]) ? $aData[$iKey][$sKey] : _t('_undefined'), $sKey, $aField, $aRow);
             }
         }
+
         return $aDataRv;
     }
-    
+
     public function getFormBlockAPI($oForm, $sAction, $iId = 0)
     {
         return [