madmin 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0ee3515b8f8689bbd5c7b6b99675c2724f0be4cf7774e97d71da99076f3b68
-  data.tar.gz: 4224940c11670cfbc2a481cc0001ad64d846595929993f5971490c1f53e0343c
+  metadata.gz: a081ce47d7f266c588a04f1998b1156b859e15526677b5b6ba39e5315efbdf45
+  data.tar.gz: 8533a2223231ba545b8a4935ea6b29ca06e3043888f41248bc096162b93f8dd3
 SHA512:
-  metadata.gz: eaf9f28c5e3dac557dceaff92f823b3372d9c927a2c429d296da83bee28c3f14cd78b31bf198bde7d43bfc8025aaa01d96e1586edc42ebef5c49e3f827929cfc
-  data.tar.gz: e0b561bb2c7d0367238ba4c9af7794161480396ccf2bc625ffad2a3adfbeb1b6919490f59a8fc24c1eac89eec4f0162e202186dc47913f41351b893972c2fb13
+  metadata.gz: a369a69825063d843569625485adf3f46102b31697195abcdb68bc674e23bff86a0208957e502061742947809236da0ae9a2628324aee4f91c9c5a410618d32d
+  data.tar.gz: a7e3acacc31d419440774347c2d571a84e4ff182b1a6e885e73437ec01d76cbe92bb5b7ddf1c66393f4fde6d03c1cc7bfdf819aae7898bda3601e4d1e2de7689

data/app/assets/stylesheets/madmin/sidebar.css

@@ -39,6 +39,7 @@
 }
 
 main {
+  overflow: auto;
   padding-right: 1rem;
   padding-bottom: 1rem;
   padding-left: calc(1rem + var(--sidebar-width));
@@ -48,7 +49,8 @@ main {
 #sidebar {
   position: absolute;
   inset: 0;
-  z-index: 10; /* Ensure sidebar is above main content */
+  /* Ensure sidebar is above main content */
+  z-index: 10;
 
   border-right: 1px solid var(--border-color);
   height: 100%;

data/lib/madmin/fields/belongs_to.rb

@@ -2,12 +2,8 @@ module Madmin
   module Fields
     class BelongsTo < Field
       def options_for_select(record)
-        records = if (record = record.send(attribute_name))
-          [record]
-        else
-          associated_resource.model.first(25)
-        end
-
+        current_value = record.send(attribute_name)
+        records = [current_value].compact + associated_resource.model.excluding(current_value).limit(25)
         records.map { [Madmin.resource_for(_1).display_name(_1), _1.id] }
       end
 

data/lib/madmin/resource.rb

@@ -71,8 +71,10 @@ module Madmin
         )
       end
 
+      # Returns singular name
+      # For example: "Forum::Post" -> "Forum / Post"
       def friendly_name
-        model_name.split("::").map { |part| part.underscore.humanize }.join(" / ").titlecase.pluralize
+        model_name.split("::").map { |part| part.underscore.humanize }.join(" / ").titlecase
       end
 
       # Support for isolated namespaces

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/madmin.rb

@@ -45,30 +45,37 @@ module Madmin
   end
 
   class << self
+    # Returns a Madmin::Resource class for the given object
     def resource_for(object)
-      if (resource_name = resource_name_for(object))
+      if (resource_name = resource_name_for(object)) && Object.const_defined?(resource_name)
         resource_name.constantize
-      end
-    rescue NameError
-      raise MissingResource, <<~MESSAGE
-        #{resource_name} is missing. Create it by running:
 
-            bin/rails generate madmin:resource #{resource_name.split("Resource").first}
-      MESSAGE
+      # STI models should look at the parent
+      elsif (resource_name = sti_resource_name_for(object)) && Object.const_defined?(resource_name)
+        resource_name.constantize
+
+      else
+        raise MissingResource, <<~MESSAGE
+          `#{object.class.name}Resource` is missing.
+
+          Create the Madmin resource by running:
+
+              bin/rails generate madmin:resource #{object.class.name}
+        MESSAGE
+      end
     end
 
     def resource_name_for(object)
       if object.is_a? ::ActiveStorage::Attached
         "ActiveStorage::AttachmentResource"
       else
-        begin
-          "#{object.class.name}Resource"
-        rescue
-          # For STI models, see if there's a superclass resource available
-          if (column = object.class.inheritance_column) && object.class.column_names.include?(column)
-            "#{object.class.superclass.base_class.name}Resource"
-          end
-        end
+        "#{object.class.name}Resource"
+      end
+    end
+
+    def sti_resource_name_for(object)
+      if (column = object.class.inheritance_column) && object.class.column_names.include?(column)
+        "#{object.class.superclass.base_class.name}Resource"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Chris Oliver