andre 1 год назад
Родитель
Сommit
aeb4a66e1a

+ 1 - 1
core/UI/MainContainer.php

@@ -30,7 +30,7 @@ class MainContainer extends Container
         $this->prepareElemnentsContainers();
     }
 
-    public function addElement($element = 0, $containerName = null)
+    public function addElement($element = null, $containerName = null)
     {
         if (is_string($element))
         {

+ 1 - 1
core/UI/ViewAjax.php

@@ -23,7 +23,7 @@ class ViewAjax extends View
     /**
      * Adds elements to the root element
      */
-    public function addElement($element)
+    public function addElement($element, $containerName = null)
     {
         return $this;
     }

+ 10 - 9
core/UI/Widget/DataTable/DataTable.php

@@ -93,7 +93,7 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
         
     }
 
-    public function setName($name)
+    public function setName($name = null)
     {
         $this->name = $name;
         return $this;
@@ -126,7 +126,7 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
         return $this;
     }
 
-    public function setData(\ModulesGarden\Servers\ProxmoxCloudVps\Core\UI\Interfaces\DataSetInterface $data)
+    public function setData(array $data = [])
     {
         $this->recordsSet = $data;
         
@@ -135,7 +135,7 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
 
     protected function getCount()
     {
-        return count($this->recordsSet->records);
+        return count($this->recordsSet['records']);
     }
 
     protected function getRecords()
@@ -158,7 +158,7 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
             $this->loadHtml();
         }
 
-        $this->setData($this->dataProvider->getData($this->columns));
+        $this->setData((array)$this->dataProvider->getData($this->columns));
     }
     
     protected function parseDataRecords()
@@ -169,9 +169,9 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
             return false;
         }
 
-        foreach ($this->recordsSet->records as $key => $row)
+        foreach ($this->recordsSet['records']  as $key => $row)
         {
-            $this->recordsSet->records[$key] = $this->replaceRowData($row, $replacementFunctions);
+            $this->recordsSet['records'][$key] = $this->replaceRowData($row, $replacementFunctions);
         }
     }
 
@@ -210,9 +210,10 @@ class DataTable extends BaseContainer implements \ModulesGarden\Servers\ProxmoxC
             
             return $this;
         }
-        
-        $row->$colName = $value;
-
+        if (is_object($row))
+        {
+            $row->$colName = $value;
+        }
         return $this;        
     }    
     

+ 1 - 1
core/UI/Widget/Forms/DataProviders/BaseDataProvider.php

@@ -58,7 +58,7 @@ abstract class BaseDataProvider implements FormDataProviderInterface
 
     public function getAvailableValuesById($id)
     {
-        if (is_array($this->availableValues[$id]) || (is_object($this->availableValues[$id]) &&  count($this->availableValues[$id]) > 0))
+        if (!is_null($this->availableValues[$id]) && (is_array($this->availableValues[$id]) || count($this->availableValues[$id]) > 0))
         {
             return $this->availableValues[$id];
         }

+ 1 - 1
core/UI/Widget/Sidebar/SidebarItem.php

@@ -47,7 +47,7 @@ class SidebarItem extends BaseContainer
         return $this->id;
     }
 
-    public function setId($id)
+    public function setId($id = null)
     {
         $this->id = $id;