rel message in new and zip file size

Author: nlagkas

etsd/msgs/forms.py

@@ -86,11 +86,11 @@ def clean(self):
 
         kind = self.cleaned_data.get("kind")
         rel_message = self.cleaned_data.get("rel_message")
-        if kind == "NEW" and rel_message:
+        '''if kind == "NEW" and rel_message:
             self.add_error(
                 "rel_message",
                 _("You cannot add a related message when message kind is New!"),
-            )
+            )'''
         if kind != "NEW" and not rel_message:
             self.add_error(
                 "rel_message",

etsd/msgs/templates/msgs/message_add_data.html

@@ -38,10 +38,14 @@
 {% block extra_script_no_compress %}
 {% get_setting_value "MAX_FILE_SIZE" as MAX_FILE_SIZE %}
 {% get_setting_value "MAX_FILE_SIZE_STR" as MAX_FILE_SIZE_STR %}
+{% get_setting_value "MAX_ZIP_SIZE" as MAX_ZIP_SIZE %}
+{% get_setting_value "MAX_ZIP_SIZE_STR" as MAX_ZIP_SIZE_STR %}
 <script>
   const requestPath = '{{ request.path }}'
   const maxFileSize = {{ MAX_FILE_SIZE }};
   const maxFileSizeStr = '{{ MAX_FILE_SIZE_STR }}';
+  const maxZipSize = {{ MAX_ZIP_SIZE }};
+  const maxZipSizeStr = '{{ MAX_ZIP_SIZE_STR }}';
 </script>
 
 <script>
@@ -76,8 +80,13 @@
       document.getElementById('file').addEventListener("change", function() {
         if (this.files && this.files[0]) {
             let theFile = this.files[0];
-            
-            if (theFile.size > maxFileSize) {
+
+            if (getFileExt(theFile.name) == 'zip' && theFile.size > maxZipSize  ) {
+              bootstrap5Alert({'message': gettext("Zip file can be up to ") + maxZipSizeStr , 'title': gettext("ERROR")})
+              document.getElementById('file').value=''
+              return 
+            }
+            else if (theFile.size > maxFileSize && getFileExt(theFile.name) != 'zip') {
               bootstrap5Alert({'message': gettext("File can be up to ") + maxFileSizeStr, 'title': gettext("ERROR")})
               document.getElementById('file').value=''
               return 

etsd/settings/base.py

@@ -198,5 +198,7 @@
 
 MAX_FILE_SIZE = 2 * 1024 * 1024  # 2MB
 MAX_FILE_SIZE_STR = "2MB"
+MAX_ZIP_SIZE = 8 * 1024 * 1024  # 8MB
+MAX_ZIP_SIZE_STR = "8MB"
 
 CHECK_LDAP_USERS = True

rsp.bat

@@ -1,2 +1,2 @@
 set WERKZEUG_DEBUG_PIN=off
-python manage.py runserver_plus
+python manage.py runserver_plus --keep-meta-shutdown