Merge branch 'release/1.0.10' into v1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Recipe Changelog
 
+## 1.0.10 - 2019.03.08
+### Changed
+* Fixed the Asset Sources settings to work with Craft 3.1
+
 ## 1.0.9 - 2019.03.08
 ### Changed
 * Add 1/3 and 1/6 fractions

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-recipe",
     "description": "A comprehensive recipe FieldType for Craft CMS that includes metric/imperial conversion, portion calculation, and JSON-LD microdata support",
     "type": "craft-plugin",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "keywords": [
         "craft",
         "cms",

src/fields/Recipe.php

@@ -18,6 +18,7 @@
 use craft\base\ElementInterface;
 use craft\base\Field;
 use craft\elements\Asset;
+use craft\helpers\Html;
 use craft\helpers\Json;
 
 use yii\db\Schema;
@@ -100,7 +101,7 @@ public function getSettingsHtml()
             .'Recipe_settings',
             [
                 'field' => $this,
-                'assetSources' => Asset::sources(),
+                'assetSources' => $this->getSourceOptions(),
             ]
         );
     }
@@ -159,4 +160,23 @@ public function getInputHtml($value, ElementInterface $element = null): string
             ]
         );
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSourceOptions(): array
+    {
+        $sourceOptions = [];
+
+        foreach (Asset::sources('settings') as $key => $volume) {
+            if (!isset($volume['heading'])) {
+                $sourceOptions[] = [
+                    'label' => Html::encode($volume['label']),
+                    'value' => $volume['key']
+                ];
+            }
+        }
+
+        return $sourceOptions;
+    }
 }