Merge branch '1.5' into 1

silverstripe · Apr 20, 2020 · 331ce4a · 331ce4a
2 parents 091d7ee + 1da24a3
commit 331ce4a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/AssetDropzone/AssetDropzone.js b/client/src/components/AssetDropzone/AssetDropzone.js
@@ -80,11 +80,12 @@ class AssetDropzone extends Component {
 
   componentWillUnmount() {
     // Remove all dropzone event listeners.
+    this.dropzone.files = [];
     this.dropzone.destroy();
   }
 
   /**
-   * Gets the default optiions to instanciate dropzone with.
+   * Gets the default options to instantiate dropzone with.
    *
    * @return object
    */

diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -85,13 +85,6 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider
      */
     private static $page_length = 50;
 
-    /**
-     * @config
-     * @see Upload->allowedMaxFileSize
-     * @var int
-     */
-    private static $allowed_max_file_size;
-
     /**
      * @config
      *
@@ -102,7 +95,7 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider
     /**
      * @config
      *
-     * @var int The max file size, in megabytes
+     * @var int The max file size, in bytes or INI format
      */
     private static $max_upload_size;
 

diff --git a/code/Extensions/CampaignAdminExtension.php b/code/Extensions/CampaignAdminExtension.php
@@ -5,6 +5,7 @@
 use SilverStripe\Assets\File;
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Security\Permission;
 
 /**
  * Extension that updates the Popover menu of `FileFormFactory`.
@@ -21,6 +22,10 @@ class CampaignAdminExtension extends Extension
      */
     public function updatePopoverActions(&$actions, $record)
     {
+        if (!Permission::check('CMS_ACCESS_CampaignAdmin')) {
+            return;
+        }
+
         if ($record && $record->canPublish()) {
             $action = FormAction::create(
                 'addtocampaign',