Remove custom dependency for asset-admin

Also fix `Image::Quality` to match signature on parent Also removes the `sync` button from the CMS file admin
MadeHQ · Feb 12, 2019 · 79d0a76 · 79d0a76
1 parent 2d2256a
commit 79d0a76
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 156 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/js/app.js b/client/src/js/app.js
@@ -1,16 +1,8 @@
 
-import CloudinaryEnhancedGalleryToolbar from './components/CloudinaryEnhancedGalleryToolbar';
 import CloudinaryPreviewImageField from './components/CloudinaryPreviewImageField';
 
 import Injector from 'lib/Injector';
 
-Injector.transform(
-    'cloudinary-sync-button',
-    updater => {
-        updater.component('GalleryToolbar', CloudinaryEnhancedGalleryToolbar);
-    }
-);
-
 Injector.transform(
     'cloudinary-preview-image-field',
     updater => {

diff --git a/client/src/js/components/CloudinaryEnhancedGalleryToolbar.js b/client/src/js/components/CloudinaryEnhancedGalleryToolbar.js
diff --git a/client/src/js/components/CloudinarySync.js b/client/src/js/components/CloudinarySync.js
diff --git a/client/src/js/components/CloudinaryToolbarFields.js b/client/src/js/components/CloudinaryToolbarFields.js
diff --git a/composer.json b/composer.json
@@ -16,6 +16,7 @@
   "require": {
     "cloudinary/cloudinary_php": "dev-master",
     "php": ">=7.0.0",
+    "silverstripe/assets": "^1.1",
     "silverstripe/asset-admin": "^1.1"
   },
   "autoload": {

diff --git a/src/Model/File.php b/src/Model/File.php
@@ -36,4 +36,11 @@ public function doArchive()
         $r = $api->delete_resources(array($this->PublicID));
         return parent::doArchive();
     }
+
+    public static function getOneByPublicId($publicId)
+    {
+        return static::get_one(static::class, [
+            'PublicID' => $publicId,
+        ]);
+    }
 }
diff --git a/src/Traits/CloudinaryFileTrait.php b/src/Traits/CloudinaryFileTrait.php
@@ -29,13 +29,6 @@ trait CloudinaryFileTrait
         'RemoteData' => 'Text',
     ];
 
-    public static function getOneByPublicId($publicId)
-    {
-        return static::get_one(static::class, [
-            'PublicID' => $publicId,
-        ]);
-    }
-
     public function updateFromCloudinary($resource)
     {
         $parentFolder = static::getParentFolderForResouce($resource);