update legacy visible columns support

directus · Apr 26, 2017 · 9be7117 · 9be7117
1 parent dcaa963
commit 9be7117
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/api/core/Directus/Database/TableGateway/RelationalTableGateway.php b/api/core/Directus/Database/TableGateway/RelationalTableGateway.php
@@ -624,6 +624,19 @@ public function applyDefaultEntriesSelectParams(array $params)
         // Stripe whitespaces
         $columns = array_map('trim', $columns);
 
+        // ----------------------------------------------------------------------------
+        // merge legacy visible columns param
+        // ----------------------------------------------------------------------------
+        // if both columns and columns_visible are passed columns are prioritized
+        // ----------------------------------------------------------------------------
+        $visibleColumns = ArrayUtils::get($params, 'columns_visible', []);
+        // columns_visible are expected to be an array
+        if (!is_array($visibleColumns)) {
+            $visibleColumns = [$visibleColumns];
+        }
+
+        $columns = array_merge($visibleColumns, $columns);
+
         // Add columns to params if it's not empty.
         // otherwise remove from params
         if (!empty($columns)) {
@@ -773,8 +786,8 @@ public function loadItems(array $params = [], \Closure $queryCallback = null)
         $builder = new Builder($this->getAdapter());
         $builder->from($this->getTable());
 
-        if (ArrayUtils::has($params, 'columns') || ArrayUtils::has($params, 'columns_visible')) {
-            $columns = array_unique(array_merge($tableSchema->getPrimaryKeysName(), ArrayUtils::get($params, 'columns', []), ArrayUtils::get($params, 'columns_visible', [])));
+        if (ArrayUtils::has($params, 'columns')) {
+            $columns = array_unique(array_merge($tableSchema->getPrimaryKeysName(), ArrayUtils::get($params, 'columns', [])));
         } else {
             $columns = $tableSchema->getColumnsName();
         }
@@ -806,7 +819,7 @@ public function loadItems(array $params = [], \Closure $queryCallback = null)
 
         $depth = ArrayUtils::get($params, 'depth', null);
         if ($depth !== null) {
-            $paramColumns = array_merge(ArrayUtils::get($params, 'columns', []), ArrayUtils::get($params, 'columns_visible', []));
+            $paramColumns = ArrayUtils::get($params, 'columns', []);
             $relationalColumns = $tableSchema->getRelationalColumnsName();
 
             if ($paramColumns) {