Update DataTable.php

Author: jcheron

Ajax/semantic/widgets/datatable/DataTable.php

@@ -15,7 +15,6 @@
 use Ajax\service\JArray;
 use Ajax\service\JString;
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
-use Ubiquity\utils\base\UArray;
 
 /**
  * DataTable widget for displaying list of objects
@@ -201,7 +200,7 @@ protected function _hideColumns() {
 	protected function _generateHeader(HtmlTable $table, $captions) {
 		$gbFields = $this->_instanceViewer->getGroupByFields();
 		if (\is_array($gbFields)) {
-			$captions = \array_values(UArray::removeByKeys($captions, $gbFields));
+			$captions = \array_values(JArray::removeByKeys($captions, $gbFields));
 		}
 		$table->setHeaderValues($captions);
 		if (isset($this->_sortable)) {
@@ -222,8 +221,8 @@ protected function _generateContent($table) {
 				return $this->_generateRow($instance, $fields, $table);
 			});
 		} else {
-			$diffFields = array_values(UArray::removeByKeys($fields, $groupByFields));
-			$activeValues = array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
+			$diffFields = \array_values(JArray::removeByKeys($fields, $groupByFields));
+			$activeValues = \array_combine($groupByFields, \array_fill(0, \count($groupByFields), null));
 			$uuids = [];
 			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids, $diffFields) {
 				$this->_instanceViewer->setInstance($instance);