fix: Allow copy with empty suffix (#1386)

* Fix #1377 * Fix: Allow empty suffix in admin copy * Add submit-row class * Fix; Cancel link too small if djangocms-admin-style is not present
django-cms · Jul 13, 2023 · fdd4d64 · fdd4d64
1 parent 71d16ca
commit fdd4d64
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/filer/admin/forms.py b/filer/admin/forms.py
@@ -26,7 +26,7 @@ class CopyFilesAndFoldersForm(forms.Form, AsPWithHelpMixin):
     # overwrite_files = forms.BooleanField(required=False, help_text=_("Overwrite a file if there already exists a file with the same filename?"))
 
     def clean_suffix(self):
-        valid = get_valid_filename(self.cleaned_data['suffix'])
+        valid = get_valid_filename(self.cleaned_data['suffix']) if self.cleaned_data['suffix'] else ""
         if valid != self.cleaned_data['suffix']:
             raise forms.ValidationError(_('Suffix should be a valid, simple and lowercase filename part, like "%(valid)s".') % {'valid': valid})
         return self.cleaned_data['suffix']

diff --git a/filer/private/sass/components/_base.scss b/filer/private/sass/components/_base.scss
@@ -116,9 +116,10 @@ body {
     padding: 20px 0 0;
 }
 
-.delete-confirmation form .cancel-link {
+form .cancel-link {
     height: auto !important;
     line-height: inherit !important;
+    padding: 10px 15px;
 }
 
 .sr-only {

diff --git a/filer/static/filer/css/admin_filer.css b/filer/static/filer/css/admin_filer.css
diff --git a/filer/static/filer/css/maps/admin_filer.css.map b/filer/static/filer/css/maps/admin_filer.css.map
diff --git a/filer/templates/admin/filer/folder/choose_copy_destination.html b/filer/templates/admin/filer/folder/choose_copy_destination.html
@@ -60,7 +60,7 @@
                         </p>
                         {{ copy_form.as_p_with_help }}
 
-                        <div class="text-right clearfix">
+                        <div class="submit-row text-right clearfix">
                             <a href="#" onclick="window.history.back(); return false;" class="button cancel-link">{% translate "No, take me back" %}</a>
                             <input type="submit" value="{% translate 'Copy' %}" class="default js-submit-copy-move">
                             <span class="js-disabled-btn-tooltip disabled-btn-tooltip js-filer-tooltip filer-tooltip-wrapper"