jav_madmin 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1651894f25b331e5c9d9bed393706adba9f6b70e778cff5b2964b2fb024ed45
-  data.tar.gz: fd60a4567983f6fe2b2f544478f5282f759eb9dbbbfe61de604ac2a5d66d389c
+  metadata.gz: c4901ab95118bdd1ee7273a72c2485dc63ebd3eeaa59206b1e96230920acae84
+  data.tar.gz: c6816fbe255ce60c1c1af161da6120795c5ac45cf7ab56e72979589c2a5ace42
 SHA512:
-  metadata.gz: 55b210975d68220711efd74200abf015dff2c67e25bc2bb84dd5c58a405d7701fbc4bd6e2ffdb58876e795b871317d26930bef6d956710d0ff12a3bdd141f472
-  data.tar.gz: 1e6e97d1ddcf1c7efda7af2cd98e1e28f79327e41483da2f0f745b6b994740a4732480976858dc34aad38d787187c4553008668efc3385440ec6c48655a286f6
+  metadata.gz: 58d2ecaa79969d5f781b02654d4f55f1728bcef1d232f8dc94d33f90f850176600cf86b9b527ad0c333486e10128115cc3122d858ba1efca5c426b9dd71f8aae
+  data.tar.gz: 40b2e8d203803b1c019404919a256df54c04be3789f2c8d15ab216459f7e691be6009848cc985a408607039537509436fa7fee24ff2cb633ef7cd4d98961f5f4

data/lib/madmin/resource.rb

@@ -97,43 +97,20 @@ module Madmin
         @route_namespace = (namespace ? namespace.name.underscore.to_sym : nil)
       end
 
-      # ori_opts = Madmin.multi_locales ? {locale: I18n.locale} : {}
-
-      # [
-      #  [:index_path, ori_opts, false],
-      #  [:new_path, ori_opts.merge(action: :new), false],
-      #  [:show_path, ori_opts, true],
-      #  [:edit_path, ori_opts.merge(action: :edit), true]
-      # ].each do |item|
-      #  if item[2]
-      #    define_method item[0] do |record, options = item[1]|
-      #      url_helpers.polymorphic_path([:madmin, route_namespace, becomes(record)], options)
-      #    end
-      #  else
-      #    define_method item[0] do |options = item[1]|
-      #      url_helpers.polymorphic_path([:madmin, route_namespace, model], options)
-      #    end
-      #  end
-      # end
-
-      def index_path(options = {})
-        ori_opts = Madmin.multi_locales ? {locale: I18n.locale} : {}
-        url_helpers.polymorphic_path([:madmin, route_namespace, model], options.merge(ori_opts))
+      def index_path(options = nil)
+        build_polymorphic_path([:madmin, route_namespace, model], options)
       end
 
-      def new_path(options = {action: :new})
-        ori_opts = Madmin.multi_locales ? {locale: I18n.locale} : {}
-        url_helpers.polymorphic_path([:madmin, route_namespace, model], options.merge(ori_opts))
+      def new_path(options = nil)
+        build_polymorphic_path([:madmin, route_namespace, model], options, action: :new)
       end
 
-      def show_path(record, options = {})
-        ori_opts = Madmin.multi_locales ? {locale: I18n.locale} : {}
-        url_helpers.polymorphic_path([:madmin, route_namespace, becomes(record)], options.merge(ori_opts))
+      def show_path(record, options = nil)
+        build_polymorphic_path([:madmin, route_namespace, becomes(record)], options)
       end
 
-      def edit_path(record, options = {action: :edit})
-        ori_opts = Madmin.multi_locales ? {locale: I18n.locale} : {}
-        url_helpers.polymorphic_path([:madmin, route_namespace, becomes(record)], options.merge(ori_opts))
+      def edit_path(record, options = nil)
+        build_polymorphic_path([:madmin, route_namespace, becomes(record)], options, action: :edit)
       end
 
       def becomes(record)
@@ -311,6 +288,17 @@ module Madmin
         @menu_options ||= {}
         @menu_options.with_defaults(label: model.model_name.i18n_key, url: index_path)
       end
+
+      private
+
+      def locale_options
+        Madmin.multi_locales ? {locale: I18n.locale} : {}
+      end
+
+      def build_polymorphic_path(path_array, options, extra_opts = {})
+        opts = (options || {}).merge(extra_opts).merge(locale_options)
+        url_helpers.polymorphic_path(path_array, opts)
+      end
     end
 
     ActiveSupport.run_load_hooks(:madmin_resource, self)

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.6.6"
+  VERSION = "2.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jav_madmin
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Chris Oliver