Merge branch 'django-cms:master' into fix/restricted-upload

Author: fsbraun

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
 #        args: [--target-version, "2.2"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
 

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+3.2.3 (2024-09-18)
+==================
+
+* fix: Use TypeVar for type-hinting of the user parameter by @payamnj in https://github.com/django-cms/django-filer/pull/1496
+
+** New contributor**
+
+* @payamnj made their first contribution in https://github.com/django-cms/django-filer/pull/1496
+
+
 3.2.2 (2024-09-09)
 ==================
 

filer/__init__.py

@@ -13,4 +13,4 @@
  8. Publish the release and it will automatically release to pypi
 """
 
-__version__ = '3.2.2'
+__version__ = '3.2.3'

filer/static/filer/js/addons/upload-button.js

@@ -29,6 +29,7 @@ if (django.jQuery) {
         var infoMessage = $('.js-filer-dropzone-info-message');
         var hiddenClass = 'hidden';
         var maxUploaderConnections = uploadButton.data('max-uploader-connections') || 3;
+        var maxFilesize = parseInt(uploadButton.data('max-filesize') || 0, 10) * 1048576;
         var hasErrors = false;
         var updateUploadNumber = function () {
             uploadNumber.text(maxSubmitNum - submitNum + '/' + maxSubmitNum);
@@ -59,6 +60,7 @@ if (django.jQuery) {
             action: uploadUrl,
             button: uploadButton[0],
             maxConnections: maxUploaderConnections,
+            sizeLimit: maxFilesize,
             onSubmit: function (id) {
                 Cl.mediator.remove('filer-upload-in-progress', removeButton);
                 Cl.mediator.publish('filer-upload-in-progress');

filer/templates/admin/filer/folder/directory_listing.html

@@ -213,7 +213,7 @@ <h2>&nbsp;</h2>
                                        data-url="{% url 'admin:filer-ajax_upload' folder_id=folder.id %}"
                                        data-max-uploader-connections="{{ uploader_connections }}"
                                        data-max-files="{{ max_files|safe }}"
-                                       {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}
+                                       {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}
                                     >
                                         {% trans "Upload Files" %}
                                     </a>
@@ -223,7 +223,7 @@ <h2>&nbsp;</h2>
                                        data-url="{% url 'admin:filer-ajax_upload' %}"
                                        data-max-uploader-connections="{{ uploader_connections }}"
                                        data-max-files="{{ max_files|safe }}"
-                                       {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}
+                                       {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}
                                     >
                                         {% trans "Upload Files" %}
                                     </a>

filer/templates/admin/filer/folder/directory_table_list.html

@@ -4,7 +4,7 @@
     <table class="js-filer-dropzone js-filer-dropzone-base navigator-table" id="result_list" data-url="{% if folder.id %}{% url 'admin:filer-ajax_upload' folder_id=folder.id %}{% else %}{% url 'admin:filer-ajax_upload' %}{% endif %}" data-folder-name="{% if folder.is_root %}{% translate 'Unsorted Uploads' %}{% else %}{{ folder.name }}{% endif %}"
            data-max-uploader-connections="{{ uploader_connections }}"
            data-max-files="{{ max_files|safe }}"
-           {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+           {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
         <thead>
             <tr>
                 <th class="column-checkbox">
@@ -170,7 +170,7 @@
          data-folder-name="{% if folder.is_root %}{% trans 'Unsorted Uploads' %}{% else %}{{ folder.name }}{% endif %}"
          data-max-uploader-connections="{{ uploader_connections }}"
          data-max-files="{{ max_files|safe }}"
-         {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+         {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
 
         <div class="icon"><span class="filer-icon filer-upload fa fa-cloud-upload"></span></div>
 

filer/templates/admin/filer/folder/directory_thumbnail_list.html

@@ -4,7 +4,7 @@
 
     <div class="js-filer-dropzone js-filer-dropzone-base navigator-list" id="result_list" data-url="{% if folder.id %}{% url 'admin:filer-ajax_upload' folder_id=folder.id %}{% else %}{% url 'admin:filer-ajax_upload' %}{% endif %}" data-folder-name="{% if folder.is_root %}{% translate 'Unsorted Uploads' %}{% else %}{{ folder.name }}{% endif %}" data-max-uploader-connections="{{ uploader_connections }}"
          data-max-files="{{ max_files|safe }}"
-         {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+         {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
 
         <input type="checkbox" id="all-items-action-toggle">
 
@@ -43,7 +43,7 @@
                      data-folder-name="{{ subfolder.name }}"
                      data-max-uploader-connections="{{ uploader_connections }}"
                      data-max-files="{{ max_files|safe }}"
-                     {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+                     {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
 
                     <div class="navigator-checkbox">
                         {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
@@ -146,7 +146,7 @@
        data-folder-name="{% if folder.is_root %}{% trans 'Unsorted Uploads' %}{% else %}{{ folder.name }}{% endif %}"
        data-max-uploader-connections="{{ uploader_connections }}"
        data-max-files="{{ max_files|safe }}"
-       {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+       {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
   <div class="icon"><span class="filer-icon filer-icon-upload fa fa-cloud-upload"></span></div>
 
       <div class="filer-dropzone-upload-welcome js-filer-dropzone-upload-welcome">

filer/templates/admin/filer/widgets/admin_file.html

@@ -17,7 +17,7 @@
     <div class="js-filer-dropzone filer-dropzone{% if object %} js-object-attached{% endif %}"
          data-url="{% url 'admin:filer-ajax_upload' %}"
          data-max-files="1"
-         {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+         {% if max_filesize %}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
         <div class="z-index-fix"></div>
         <div class="dz-default dz-message js-filer-dropzone-message{% if object %} hidden{% endif %}">
             <span class="icon filer-icon filer-icon-arrow-down fa fa-arrow-down"></span><span>{% translate "or drop your file here" %}</span>