Merge branch '6.0' into 6

silverstripe · Jun 7, 2023 · 183cd08 · 183cd08
2 parents 4210189 + 3c7fb05
commit 183cd08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/client/dist/js/userforms-cms.js b/client/dist/js/userforms-cms.js
diff --git a/client/src/bundles/ConfirmFolder.js b/client/src/bundles/ConfirmFolder.js
@@ -61,7 +61,7 @@ jQuery.entwine('ss', ($) => {
   $('#Form_ConfirmFolderForm_FolderID_Holder .treedropdownfield.is-open,#Form_ItemEditForm_FolderID .treedropdownfield.is-open').entwine({
     onunmatch() {
       // Build url
-      const adminUrl = $(this).closest('#Form_ConfirmFolderForm').data('adminUrl');
+      const adminUrl = window.ss.config.adminUrl || '/admin/';
       const parsedURL = url.parse(joinUrlPaths(adminUrl, 'user-forms/getfoldergrouppermissions'));
       const parsedQs = qs.parse(parsedURL.query);
       parsedQs.FolderID = $(this).find('input[name=FolderID]').val();
@@ -106,9 +106,7 @@ jQuery.entwine('ss', ($) => {
 
       dialog = $('<div id="confirm-folder__dialog-wrapper" />');
       const id = $(this).closest('tr').data('id');
-      const adminUrl = $(this).closest('.uf-field-editor').data('adminUrl');
       dialog.data('id', id);
-      dialog.data('adminUrl', adminUrl);
       $('body').append(dialog);
 
       dialog.open();
@@ -146,7 +144,7 @@ jQuery.entwine('ss', ($) => {
       const editableFileFieldID = $(this).data('id');
 
       // Build schema url
-      const adminUrl = $(this).data('adminUrl');
+      const adminUrl = window.ss.config.adminUrl || '/admin/';
       const parsedURL = url.parse(joinUrlPaths(adminUrl, 'user-forms/confirmfolderformschema'));
       const parsedQs = qs.parse(parsedURL.query);
       parsedQs.ID = editableFileFieldID;

diff --git a/code/Control/UserDefinedFormAdmin.php b/code/Control/UserDefinedFormAdmin.php
@@ -200,8 +200,7 @@ private function buildConfirmFolderForm(string $suggestedFolderName = '', string
 
         return Form::create($this, 'ConfirmFolderForm', $fields, $actions, RequiredFields::create('ID'))
             ->setFormAction($this->Link('ConfirmFolderForm'))
-            ->addExtraClass('form--no-dividers')
-            ->setAttribute('data-admin-url', AdminRootController::admin_url());
+            ->addExtraClass('form--no-dividers');
     }
 
     /**

diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php
@@ -126,8 +126,7 @@ public function getFieldEditorGrid()
             $fields,
             $config
         )
-            ->addExtraClass('uf-field-editor')
-            ->setAttribute('data-admin-url', AdminRootController::admin_url());
+            ->addExtraClass('uf-field-editor');
 
         return $fieldEditor;
     }