Merge branch 'feature/craft31' into develop

presseddigital · Jan 18, 2019 · 32ccde9 · 32ccde9
2 parents 9d23010 + 6222bf8
commit 32ccde9
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Linkit Changelog
 > One link field to rule them all, built for [Craft 3](http://craftcms.com)
 
+## 1.1.6 - 2019-01-17
+
+### Fixed
+
+*	Fixed Craft 2 migration error preventing install on Craft 3.1.x
+*   Removed some unused template tags
+*   Fixed issues bug on the about page
+
 ## 1.1.5.1 - 2019-01-15
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
 	"name": "fruitstudios/linkit",
 	"description": "One link field to rule them all.",
 	"type": "craft-plugin",
-	"version": "1.1.5.1",
+	"version": "1.1.6",
 	"keywords": [
 		"craft",
 		"cms",

diff --git a/src/Linkit.php b/src/Linkit.php
@@ -24,7 +24,7 @@ class Linkit extends Plugin
     // Public Methods
     // =========================================================================
 
-    public $schemaVersion = '1.0.7.1';
+    public $schemaVersion = '1.0.8';
 
     public function init()
     {

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -14,6 +14,8 @@
 use Craft;
 use craft\db\Migration;
 use craft\helpers\Json;
+use craft\services\Fields;
+use craft\services\Plugins;
 
 class Install extends Migration
 {
@@ -26,37 +28,43 @@ public function safeUp()
 
     private function _upgradeFromCraft2()
     {
-        // Locate and remove old linkit
-        $row = (new \craft\db\Query())
-            ->select(['id', 'settings'])
-            ->from(['{{%plugins}}'])
-            ->where(['in', 'handle', ['fruitlinkit', 'fruit-link-it', 'fruit-linkit']])
-            ->one();
+        // Get Project Config
+        $projectConfig = Craft::$app->getProjectConfig();
 
-        if($row)
+        // Don't make the same config changes twice
+        $schemaVersion = $projectConfig->get('plugins.linkit.schemaVersion', true);
+        if (version_compare($schemaVersion, '3.1.8', '>='))
         {
-            $this->delete('{{%plugins}}', ['id' => $row['id']]);
+            return;
         }
 
-        // Look for any old linkit fields and update their settings
-        $fields = (new \craft\db\Query())
-            ->select(['id', 'settings'])
-            ->from(['{{%fields}}'])
-            ->where(['in', 'type', ['FruitLinkIt']])
-            ->all();
+        // Locate and remove old linkit
+        $plugins = $projectConfig->get(Plugins::CONFIG_PLUGINS_KEY) ?? [];
+        foreach ($plugins as $pluginHandle => $pluginData)
+        {
+            switch ($pluginHandle)
+            {
+                case 'fruitlinkit':
+                case 'fruit-link-it':
+                case 'fruit-linkit':
+                    $projectConfig->remove(Plugins::CONFIG_PLUGINS_KEY . '.' . $pluginHandle);
+                    break;
+            }
+        }
 
-        if($fields)
+
+        // Get the field data from the project config
+        $fields = $projectConfig->get(Fields::CONFIG_FIELDS_KEY) ?? [];
+        foreach ($fields as $fieldUid => $fieldData)
         {
-            // Update field settings
-            foreach($fields as $field)
+            if ($fieldData['type'] === 'FruitLinkIt')
             {
-                $oldSettings = $field['settings'] ? Json::decode($field['settings']) : null;
-                $newSettings = $this->_migrateFieldSettings($oldSettings);
+                $oldSettings = $fieldData['settings'] ? Json::decode($fieldData['settings']) : null;
+
+                $fieldData['type'] = LinkitField::class;
+                $fieldData['settings'] = $this->_migrateFieldSettings($oldSettings);
 
-                $this->update('{{%fields}}', [
-                    'type' => LinkitField::class,
-                    'settings' => Json::encode($newSettings)
-                ], ['id' => $field['id']]);
+                $projectConfig->set(Fields::CONFIG_FIELDS_KEY . '.' . $fieldUid, $fieldData);
             }
         }
 

diff --git a/src/migrations/m180423_175007_linkit_craft2.php b/src/migrations/m180423_175007_linkit_craft2.php
@@ -14,6 +14,8 @@
 use Craft;
 use craft\db\Migration;
 use craft\helpers\Json;
+use craft\services\Fields;
+use craft\services\Plugins;
 
 class m180423_175007_linkit_craft2 extends Migration
 {
@@ -27,37 +29,42 @@ public function safeUp()
 
     private function _upgradeFromCraft2()
     {
-        // Locate and remove old linkit
-        $row = (new \craft\db\Query())
-            ->select(['id', 'settings'])
-            ->from(['{{%plugins}}'])
-            ->where(['in', 'handle', ['fruitlinkit', 'fruit-link-it', 'fruit-linkit']])
-            ->one();
+        // Get Project Config
+        $projectConfig = Craft::$app->getProjectConfig();
 
-        if($row)
+        // Don't make the same config changes twice
+        $schemaVersion = $projectConfig->get('plugins.linkit.schemaVersion', true);
+        if (version_compare($schemaVersion, '3.1.8', '>='))
         {
-            $this->delete('{{%plugins}}', ['id' => $row['id']]);
+            return;
         }
 
-        // Look for any old linkit fields and update their settings
-        $fields = (new \craft\db\Query())
-            ->select(['id', 'settings'])
-            ->from(['{{%fields}}'])
-            ->where(['in', 'type', ['FruitLinkIt']])
-            ->all();
+        // Locate and remove old linkit
+        $plugins = $projectConfig->get(Plugins::CONFIG_PLUGINS_KEY) ?? [];
+        foreach ($plugins as $pluginHandle => $pluginData)
+        {
+            switch ($pluginHandle)
+            {
+                case 'fruitlinkit':
+                case 'fruit-link-it':
+                case 'fruit-linkit':
+                    $projectConfig->remove(Plugins::CONFIG_PLUGINS_KEY . '.' . $pluginHandle);
+                    break;
+            }
+        }
 
-        if($fields)
+        // Get the field data from the project config
+        $fields = $projectConfig->get(Fields::CONFIG_FIELDS_KEY) ?? [];
+        foreach ($fields as $fieldUid => $fieldData)
         {
-            // Update field settings
-            foreach($fields as $field)
+            if ($fieldData['type'] === 'FruitLinkIt')
             {
-                $oldSettings = $field['settings'] ? Json::decode($field['settings']) : null;
-                $newSettings = $this->_migrateFieldSettings($oldSettings);
+                $oldSettings = $fieldData['settings'] ? Json::decode($fieldData['settings']) : null;
+
+                $fieldData['type'] = LinkitField::class;
+                $fieldData['settings'] = $this->_migrateFieldSettings($oldSettings);
 
-                $this->update('{{%fields}}', [
-                    'type' => LinkitField::class,
-                    'settings' => Json::encode($newSettings)
-                ], ['id' => $field['id']]);
+                $projectConfig->set(Fields::CONFIG_FIELDS_KEY . '.' . $fieldUid, $fieldData);
             }
         }
 

diff --git a/src/templates/fields/_settings.twig b/src/templates/fields/_settings.twig
@@ -14,12 +14,14 @@
 	}) }}
 	#}
 
-	{{ forms.lightSwitchField({
-		id: 'enableAllTypes',
-		label: 'Enable all link types',
-		instructions: 'Switch on all link types for this field',
-		on: false,
-	}) }}
+	{#
+		{{ forms.lightSwitchField({
+			id: 'enableAllTypes',
+			label: 'Enable all link types',
+			instructions: 'Switch on all link types for this field',
+			on: false,
+		}) }}
+    #}
 
 	{{ forms.field({
 		errors: field.getErrors('enabledLinkTypes'),