glib-web 4.35.3 → 4.35.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 139b8bb1e77c9778bb396d3ed8da72c74051d9cae9cacbae23dd713357ad9586
-  data.tar.gz: 200ab9fae64c136049b7eb288898216ede1c261dba047e1f386166daa0ab0309
+  metadata.gz: bd64c82e1baa6874b8791fdc0a330916a9463e92145a5e7c8ac3a6b64ef271dd
+  data.tar.gz: 85ea472517490fd0d2fc572531869964240111df12d2e93b9fc35a569ece071d
 SHA512:
-  metadata.gz: a5761de4b8433b8aec45ac23f3890cc66f1052426d133e37e40d25e3bb10109ef6ac13ee607554b3db7d7b0695086f7823e86f7cb432ea377317b83d35d26375
-  data.tar.gz: d308d941d36c01460174449bc7375cbae1c767dd9797b56f4c008e86985605b890bb292c678d69a93e8a34e63e914921984d0fddde80d6eaa270cb6ae5275ae4
+  metadata.gz: 4cfd05eee3620fc4177e75f7e5f43904e1560084979aad3bc522beb837afc45e86b47f766feb2ada4b69d4f20a14b236907f04e4072968316d7b2b99100fdebe
+  data.tar.gz: 1afe10ae33a3688b85be1cd1f966ff8bd01d60eaca51fb3602d4d1c8d52b6276701371f455758d488248c1ea344c8e019e6c2b61878dcd5ea88be52725c15dd2

data/app/controllers/concerns/glib/json/libs.rb

@@ -68,10 +68,10 @@ module Glib::Json::Libs
 
     # As much as possible, try retaining the front fragment by matching the back, because
     # the front could be either a `?` or `&`
-    url = url.sub(/format=json\&/, '');
+    url = url.sub(/format=json\&/, '')
 
     # If no match, then we replace the front fragment
-    url.sub(/[\&\?]format=json/, '');
+    url.sub(/[\&\?]format=json/, '')
   end
 
   def glib_redirect_to(url, return_to_previous: false, status: :ok)
@@ -87,6 +87,13 @@ module Glib::Json::Libs
           return
         end
 
+        # Inside a dialog, it's easier to simply use HTTP redirect, as opposed to trying to
+        # get the dialog to perform manual redirection.
+        if glib_json_dialog_mode?
+          redirect_to url
+          return
+        end
+
         json_ui_redirect_to url, status: status
       end
     end
@@ -152,14 +159,14 @@ module Glib::Json::Libs
         end
 
         render json: if glib_json_dialog_mode?
-          { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
-        else
-          {
-            onResponse: {
-              action: 'windows/open', url: user_default_url
-            }
-          }
-        end, status: Rails.env.test? ? :forbidden : :ok
+                       { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
+                     else
+                       {
+                         onResponse: {
+                           action: 'windows/open', url: user_default_url
+                         }
+                       }
+                     end, status: Rails.env.test? ? :forbidden : :ok
       end
       format.csv do
         if Rails.env.test?
@@ -229,7 +236,7 @@ module Glib::Json::Libs
     if json_ui_activated?
       if Rails.env.production? || preview_mode
         if defined?(Rollbar) && !preview_mode
-          Rollbar.error(exception, :use_exception_level_filters => true)
+          Rollbar.error(exception, use_exception_level_filters: true)
         end
 
         render file: Rails.root.join('public', '500.html'), status: :internal_server_error
@@ -261,7 +268,7 @@ module Glib::Json::Libs
     if glib_json_dialog_mode?
       # Only do this in dialog mode because this seems to add to the rendering time
       # (i.e. longer flicker time), presumably due to the use of things like `nextTick()`.
-      on_response = { action: 'dialogs/close', onClose: on_load }
+      on_response = { action: 'dialogs/close', onClose: on_response }
     end
 
     # Use onResponse because it is harder to guarantee that `onLoad` executes in Vuejs because it relies

data/app/helpers/glib/json_ui/default.rb

@@ -7,7 +7,7 @@ module Glib
           button: I18n.t('glib.accepts.max_file_size_error.button', default: nil) || 'Dismiss'
         }
         default_max_length_error = {
-          body: I18n.t('glib.accepts.max_file_length_error.body', default: nil) || 'Files exceed the maximum limit per upload',
+          body: I18n.t('glib.accepts.max_file_length_error.body', default: nil) || 'Files exceed the maximum limit',
           button: I18n.t('glib.accepts.max_file_length_error.button', default: nil) || 'Dismiss'
         }
 

data/app/views/json_ui/garage/forms/file_upload.json.jbuilder

@@ -46,7 +46,15 @@ page.form options.merge(childViews: ->(form) do
     name: 'user[multi][]',
     id: 'upload_1',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 10 },
+    accepts: {
+      fileType: 'image',
+      maxFileSize: 10,
+      maxFileLength: 2,
+      maxFileLengthErrorText: {
+        body: 'try with a smaller number of files',
+        button: 'OK'
+      }
+     },
     directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     storagePrefix: 'glib',
@@ -70,7 +78,10 @@ page.form options.merge(childViews: ->(form) do
     name: 'user[multi2][]',
     id: 'upload_2',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 5000 },
+    accepts: {
+      fileType: 'image',
+      maxFileSize: 5000
+    },
     directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     onFinishUpload: ->(action) { action.forms_submit }
@@ -89,7 +100,7 @@ page.form options.merge(childViews: ->(form) do
   form.fields_multiUpload \
     name: 'user[multi3][]',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 100 },
+    accepts: { fileType: 'image', maxFileSize: 100, maxFileLength: 2 },
     uploadTitle: 'Files uploaded:',
     onFinishUpload: ->(action) { action.forms_submit }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.35.3
+  version: 4.35.5
 platform: ruby
 authors:
 - ''