Merge branch '2.0' into 2

silverstripe · Jun 12, 2023 · 31ff2e0 · 31ff2e0
2 parents ca98e30 + 181f973
commit 31ff2e0
Show file tree

Hide file tree

Showing 46 changed files with 32 additions and 259 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/src/entwine/TinyMCE_sslink-file.js b/client/src/entwine/TinyMCE_sslink-file.js
@@ -72,6 +72,7 @@ jQuery.entwine('ss', ($) => {
       const attrs = this.getOriginalAttributes();
       const editor = this.getElement().getEditor();
       const selection = editor.getInstance().selection;
+      const folderId = this.getFolderId();
       const selectionContent = editor.getSelection();
       const tagName = selection.getNode().tagName;
       const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
@@ -86,6 +87,7 @@ jQuery.entwine('ss', ($) => {
         <InjectableInsertMediaModal
           isOpen={isOpen}
           type="insert-link"
+          folderId={folderId}
           onInsert={handleInsert}
           onClosed={handleHide}
           title={false}
@@ -118,6 +120,22 @@ jQuery.entwine('ss', ($) => {
       };
     },
 
+    /**
+     * Get default upload folder
+     *
+     * @returns {(number|null)}
+     */
+    getFolderId() {
+      const $field = this.getElement();
+      if (!$field) {
+        return null;
+      }
+
+      // Check type safely
+      const folderId = Number($field.data('config').upload_folder_id);
+      return isNaN(folderId) ? null : folderId;
+    },
+
     getOriginalAttributes() {
       const editor = this.getElement().getEditor();
       const node = $(editor.getSelectedNode());

diff --git a/code/Forms/AssetFormFactory.php b/code/Forms/AssetFormFactory.php
@@ -152,9 +152,9 @@ protected function getSaveAction($record)
                 ->setIcon('save')
                 ->setSchemaState([
                     'data' => [
-                        'pristineTitle' => _t(__CLASS__.'SAVED', 'Saved'),
+                        'pristineTitle' => _t(__CLASS__.'.SAVED', 'Saved'),
                         'pristineIcon' => 'tick',
-                        'dirtyTitle' => _t(__CLASS__.'SAVE', 'Save'),
+                        'dirtyTitle' => _t(__CLASS__.'.SAVE', 'Save'),
                         'dirtyIcon' => 'save',
                         'pristineClass' => 'btn-outline-primary',
                         'dirtyClass' => '',

diff --git a/code/Forms/FileFormFactory.php b/code/Forms/FileFormFactory.php
@@ -249,9 +249,9 @@ protected function getPublishAction($record)
                 'data' => [
                     'isPublished' => $record->isPublished(),
                     'isModified' => $record->isModifiedOnDraft(),
-                    'pristineTitle' => _t(__CLASS__ . 'PUBLISHED', 'Published'),
+                    'pristineTitle' => _t(__CLASS__ . '.PUBLISHED', 'Published'),
                     'pristineIcon' => 'tick',
-                    'dirtyTitle' => _t(__CLASS__ . 'PUBLISH', 'Publish'),
+                    'dirtyTitle' => _t(__CLASS__ . '.PUBLISH', 'Publish'),
                     'dirtyIcon' => 'rocket',
                     'pristineClass' => 'btn-outline-primary',
                     'dirtyClass' => 'btn-primary',

diff --git a/code/Forms/MoveFormFactory.php b/code/Forms/MoveFormFactory.php
@@ -23,13 +23,13 @@ public function getForm(RequestHandler $controller = null, $name = self::DEFAULT
             FieldList::create(
                 TreeDropdownField::create(
                     'FolderID',
-                    _t(__CLASS__.'CHOOSEFOLDER', 'Choose a folder'),
+                    _t(__CLASS__.'.CHOOSEFOLDER', 'Choose a folder'),
                     Folder::class
                 )->setValue((int) $context['FolderID'])
                 ->setTitleField('Filename')
             ),
             FieldList::create(
-                FormAction::create('move', _t(__CLASS__.'MOVE', 'Move'))
+                FormAction::create('move', _t(__CLASS__.'.MOVE', 'Move'))
                     ->addExtraClass('btn-primary font-icon-folder-move')
             )
         );

diff --git a/lang/af.yml b/lang/af.yml
@@ -16,8 +16,6 @@ af:
     EDITINFO: 'Verander die lêer'
     FIELDNOTSET: 'Die lêer informasie kan nie gevind word nie'
     REMOVE: Verwyder
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/ar.yml b/lang/ar.yml
@@ -17,8 +17,6 @@ ar:
     EDITINFO: 'قم بتعديل هذا الملف'
     FIELDNOTSET: 'لا يوجد معلومات عن الملف'
     REMOVE: حذف
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/bg.yml b/lang/bg.yml
@@ -18,8 +18,6 @@ bg:
     EDITINFO: 'Редактирай този файл'
     FIELDNOTSET: 'Информация за файла не беше намерена'
     REMOVE: Премахни
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/bs.yml b/lang/bs.yml
@@ -10,8 +10,6 @@ bs:
     Filetype: 'File type'
     ImageSpecs: Dimensions
     LASTEDIT: 'Last changed'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/cs.yml b/lang/cs.yml
@@ -19,8 +19,6 @@ cs:
     EDITINFO: 'Editovat tento soubor'
     FIELDNOTSET: 'Žádná informace o souboru'
     REMOVE: Odstranit
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/da.yml b/lang/da.yml
@@ -1,13 +1,4 @@
 da:
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Gem
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Gemt
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Udgiv
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Udgivet
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Vælg en mappe'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Flyt
   SilverStripe\AssetAdmin\BatchAction\DeleteAssets:
     TITLE: 'Slet mapper'
   SilverStripe\AssetAdmin\Controller\AssetAdmin:

diff --git a/lang/de.yml b/lang/de.yml
@@ -1,13 +1,4 @@
 de:
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Speichern
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Gespeichert
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Veröffentlichen
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Veröffentlicht
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Ordner auswählen'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Verschieben
   SilverStripe\AssetAdmin\BatchAction\DeleteAssets:
     TITLE: 'Ordner löschen'
   SilverStripe\AssetAdmin\Controller\AssetAdmin:

diff --git a/lang/el.yml b/lang/el.yml
@@ -8,8 +8,6 @@ el:
     Filetype: 'File type'
     ImageSpecs: Dimensions
     LASTEDIT: 'Last changed'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/en.yml b/lang/en.yml
@@ -2,15 +2,6 @@ en:
   AssetAdmin:
     INSERT_FILE: 'Insert file'
     UPDATE_FILE: 'Update file'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Saved
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Publish
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Published
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Choose a folder'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Move
   SilverStripe\Admin\FileStatusIcon:
     ACCESS_RESTRICTED: 'Restricted access'
     TRACKED_FORM_UPLOAD_RESTRICTED: 'Form submission'
@@ -80,6 +71,7 @@ en:
     ONLY_GROUPS: 'Only these groups (choose from list)'
     ROOTNAME: '(Top level)'
     SAVE: Save
+    SAVED: Saved
     VIEWERGROUPS: 'Viewer Groups'
   SilverStripe\AssetAdmin\Forms\FileFormFactory:
     DOWNLOAD_FILE: 'Download file'
@@ -89,6 +81,8 @@ en:
     LINKOPTIONS: 'Link options'
     LINKTEXT: 'Link text'
     OTHER_ACTIONS: 'Other actions'
+    PUBLISH: Publish
+    PUBLISHED: Published
     REPLACE_FILE: 'Replace file'
     UNEMEDABLE_MESSAGE: '<p class="alert alert-info alert--no-border editor__top-message">This file type can only be inserted as a link. You can edit the link once it is inserted.</p>'
     USAGE: 'Used on'
@@ -99,6 +93,9 @@ en:
     CREATE: Create
   SilverStripe\AssetAdmin\Forms\FolderFormFactory:
     FOLDERNAME: 'Folder name'
+  SilverStripe\AssetAdmin\Forms\MoveFormFactory:
+    CHOOSEFOLDER: 'Choose a folder'
+    MOVE: Move
   SilverStripe\AssetAdmin\Forms\RemoteFileFormFactory:
     AddMedia: 'Add media'
     Cancel: Cancel

diff --git a/lang/eo.yml b/lang/eo.yml
@@ -2,15 +2,6 @@ eo:
   AssetAdmin:
     INSERT_FILE: 'Enmeti dosieron'
     UPDATE_FILE: 'Ĝisdatigi dosieron'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Konservi
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Konservita
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Publikigi
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Publikigita
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Elekti dosierujon'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Movi
   SilverStripe\Admin\FileStatusIcon:
     ACCESS_RESTRICTED: 'Limigita aliro'
     TRACKED_FORM_UPLOAD_RESTRICTED: 'Sendi formularon'

diff --git a/lang/es.yml b/lang/es.yml
@@ -19,8 +19,6 @@ es:
     EDITINFO: 'Editar este archivo'
     FIELDNOTSET: 'No ha sido encontrada la información del archivo'
     REMOVE: Eliminar
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/et_EE.yml b/lang/et_EE.yml
@@ -17,8 +17,6 @@ et_EE:
     EDITINFO: 'Muuda seda faili'
     FIELDNOTSET: 'Failiteavet ei leitud'
     REMOVE: Eemalda
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
@@ -19,8 +19,6 @@ fa_IR:
     EDITINFO: 'ویرایش این فایل'
     FIELDNOTSET: 'اطلاعات فایل پیدا نشد'
     REMOVE: حذف
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/fi.yml b/lang/fi.yml
@@ -19,8 +19,6 @@ fi:
     EDITINFO: 'Muokkaa tätä tiedostoa'
     FIELDNOTSET: 'Tietoja tiedostosta ei löytynyt'
     REMOVE: Poista
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/fr.yml b/lang/fr.yml
@@ -1,13 +1,4 @@
 fr:
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Sauvegarder
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Sauvegardé
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Publier
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Publié
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Choisir un dossier'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Déplacer
   SilverStripe\AssetAdmin\BatchAction\DeleteAssets:
     TITLE: 'Supprimer les dossiers'
   SilverStripe\AssetAdmin\Controller\AssetAdmin:

diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml
@@ -11,8 +11,6 @@ gl_ES:
   SilverStripe\AssetAdmin\Forms\UploadField:
     EDITINFO: 'Editar este ficheiro'
     FIELDNOTSET: 'Ficheiro de información non atopado'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/he_IL.yml b/lang/he_IL.yml
@@ -11,8 +11,6 @@ he_IL:
     Filetype: 'File type'
     ImageSpecs: Dimensions
     LASTEDIT: 'Last changed'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/hr.yml b/lang/hr.yml
@@ -1,13 +1,4 @@
 hr:
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Spremi
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Spremljeno
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Objavi
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Objavljeno
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Odaberi direktorij'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Premjesti
   SilverStripe\AssetAdmin\BatchAction\DeleteAssets:
     TITLE: 'Obriši direktorije'
   SilverStripe\AssetAdmin\Controller\AssetAdmin:

diff --git a/lang/hu.yml b/lang/hu.yml
@@ -10,8 +10,6 @@ hu:
     Filetype: 'File type'
     ImageSpecs: Dimensions
     LASTEDIT: 'Last changed'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/id.yml b/lang/id.yml
@@ -17,8 +17,6 @@ id:
     EDITINFO: 'Edit berkas ini'
     FIELDNOTSET: 'Informasi berkas tidak ada'
     REMOVE: Buang
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/is.yml b/lang/is.yml
@@ -1,6 +1,4 @@
 is:
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Controller\AssetAdmin:
     CREATED: 'First uploaded'
     DELETE_BUTTON: Delete

diff --git a/lang/it.yml b/lang/it.yml
@@ -2,15 +2,6 @@ it:
   AssetAdmin:
     INSERT_FILE: 'Inserire file'
     UPDATE_FILE: 'Aggiorna file'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Salva
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVED: Salvato
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Pubblica
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Pubblicato
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryCHOOSEFOLDER: 'Scegli una cartella'
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Sposta
   SilverStripe\Admin\FileStatusIcon:
     ACCESS_RESTRICTED: 'Accesso ristretto'
     TRACKED_FORM_UPLOAD_RESTRICTED: 'Inoltro modulo'

diff --git a/lang/ja.yml b/lang/ja.yml
@@ -17,8 +17,6 @@ ja:
     EDITINFO: このファイルを編集
     FIELDNOTSET: ファイル情報が見つかりませんでした
     REMOVE: 削除
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/ko.yml b/lang/ko.yml
@@ -8,8 +8,6 @@ ko:
     Filetype: 'File type'
     ImageSpecs: Dimensions
     LASTEDIT: 'Last changed'
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/lt.yml b/lang/lt.yml
@@ -22,13 +22,6 @@ lt:
     EDITINFO: 'Redaguoti šią bylą'
     FIELDNOTSET: 'Informacija apie bylą nerasta'
     REMOVE: Pašalinti
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
-  FileFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISH: Publikuoti
-    php.SilverStripe\AssetAdmin\Forms\FileFormFactoryPUBLISHED: Publikuota
-  MoveFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\MoveFormFactoryMOVE: Perkelti
   SilverStripe\Admin\FileStatusIcon:
     ACCESS_RESTRICTED: 'Ribotas priėjimas'
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:

diff --git a/lang/mi.yml b/lang/mi.yml
@@ -17,8 +17,6 @@ mi:
     EDITINFO: 'Whakatikatia tēnei kōnae'
     FIELDNOTSET: 'Kāore i kitea te mōhiohio kōnae'
     REMOVE: Tango
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save

diff --git a/lang/nb.yml b/lang/nb.yml
@@ -17,8 +17,6 @@ nb:
     EDITINFO: 'Rediger denne filen'
     FIELDNOTSET: 'Filinformasjon ikke funnet'
     REMOVE: Fjern
-  AssetFormFactory:
-    php.SilverStripe\AssetAdmin\Forms\AssetFormFactorySAVE: Save
   SilverStripe\AssetAdmin\Forms\AssetFormFactory:
     FILENAME: Filename
     SAVE: Save