Layout migration

verbb · Aug 12, 2020 · 7cc9045 · 7cc9045
1 parent 43ffb11
commit 7cc9045
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/migrations/m200812_100000_layout_sortorder.php b/src/migrations/m200812_100000_layout_sortorder.php
@@ -24,14 +24,23 @@ public function safeUp()
             $this->addColumn('{{%cpnav_layout}}', 'sortOrder', $this->smallInteger()->unsigned()->after('permissions'));
         }
 
-        $layouts = (new Query())
-            ->from('{{%cpnav_layout}}')
-            ->all();
+        $projectConfig = Craft::$app->getProjectConfig();
+
+        // Don't make the same config changes twice
+        $schemaVersion = $projectConfig->get('plugins.cp-nav.schemaVersion', true);
+        if (version_compare($schemaVersion, '2.0.7', '>=')) {
+            return;
+        }
+
+        // Populate `sortOrder` 
+        $layouts = Craft::$app->getProjectConfig()->get(LayoutsService::CONFIG_LAYOUT_KEY);
 
         $sortOrder = 0;
 
-        foreach ($layouts as $layout) {
-            $this->update('{{%cpnav_layout}}', ['sortOrder' => $sortOrder++], ['id' => $layout['id']]);
+        foreach ($layouts as $layoutUid => $layout) {
+            $layout['sortOrder'] = ++$sortOrder;
+
+            Craft::$app->getProjectConfig()->set(LayoutsService::CONFIG_LAYOUT_KEY . '.' . $layoutUid, $layout);
         }
 
         return true;

diff --git a/src/services/LayoutsService.php b/src/services/LayoutsService.php
@@ -281,18 +281,24 @@ private function _getLayoutRecord(string $uid): LayoutRecord
 
     private function _createLayoutQuery(): Query
     {
-        return (new Query())
+        $query = (new Query())
             ->select([
                 'id',
                 'name',
                 'isDefault',
                 'permissions',
-                'sortOrder',
                 'dateUpdated',
                 'dateCreated',
                 'uid',
             ])
-            ->from(['{{%cpnav_layout}}'])
-            ->orderBy(['sortOrder' => SORT_ASC]);
+            ->from(['{{%cpnav_layout}}']);
+
+        $schemaVersion = Craft::$app->getProjectConfig()->get('plugins.cp-nav.schemaVersion', true);
+        if (version_compare($schemaVersion, '2.0.7', '>=')) {
+            $query->addSelect(['sortOrder']);
+            $query->orderBy(['sortOrder' => SORT_ASC]);
+        }
+
+        return $query;
     }
 }