slash_admin 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c90c097781b6d4de18232be80a73c746c0a635306f09583518dc579fc080f7c
-  data.tar.gz: 3b557ba04b67537b1bff365b4ac7021b09952be5ba659f6f4172da94e70ab309
+  metadata.gz: 1972b380ac6782c7921b54ef60b515ebf3ccbc33499721d871c657f01a6b1060
+  data.tar.gz: ece587720d629fc7e1960b2ff5b4f6d4f6d4414fc0c041cad48b9f361a99008d
 SHA512:
-  metadata.gz: cdf0e1651f829df415e7d0c176645df9556472198817eb1c2de67f423eae9b57bba1fde9674e0da1ea0fff930d615865811327fc03209959a84963b93af81e6d
-  data.tar.gz: 9239fa0a4b215c8b65bad862601d5e305a480851c3dd6223557c0c2c80fc5a4ffc5a80f985b154e3bd3ff788b8bdc0a9bf13ff9b551ac784d15caf0ace9ee3fd
+  metadata.gz: bf2af28c8509da877de6786dad8890143a9d3697d6eae4c3732cc6f6d6644d32244851d3e46e34254455f6ea0fc625012e1014cfd9f1c9871f63400a2d25d808
+  data.tar.gz: cb011eaabf99b171edfb7b9761d72b266e73432861bfa4f71c8d26ae1ca39f801412bf68a0b8dff6cf0abca0a79befb3bb7a4d1ac5c17e6b5e8b6336a70a3c4e

data/app/assets/stylesheets/slash_admin/application.scss

@@ -449,12 +449,10 @@ i {
 
   .dropdown {
     .dropdown-menu {
-      width: 195px;
       padding: 0;
       border-radius: 0;
       box-shadow: 5px 5px rgba(102, 102, 102, 0.1);
       border: 1px solid #eee;
-      right: 0;
       margin-top: -6px;
       left: initial;
 

data/app/controllers/slash_admin/models_controller.rb

@@ -215,10 +215,13 @@ module SlashAdmin
           if @model_class.respond_to?(:translated_attribute_names) && @model_class.translated_attribute_names.include?(attr.to_sym)
             attr = "#{@model_class.name.singularize.underscore}_translations.#{attr}"
           end
+          attr_prefixed = model.table_name + '.' + attr
           case attr_type
+          # TODO : Should be rewritten
           when 'belongs_to'
             search = search.eager_load(attr.to_s)
             search = search.where(attr.to_s + '_id IN (' + query.join(',') + ')')
+          # TODO : Should be rewritten
           when 'has_one'
             search = search.eager_load(attr.to_s)
             search = search.where(attr.to_s.pluralize + '.id IN (' + query.join(',') + ')')
@@ -229,33 +232,33 @@ module SlashAdmin
               virtual_fields << attr.to_s
             else
               begin
-                search = search.where("unaccent(lower(#{attr})) LIKE unaccent(lower(:query))", query: "%#{query}%")
+                search = search.where("unaccent(lower(#{attr_prefixed})) LIKE unaccent(lower(:query))", query: "%#{query}%")
               rescue
-                search = search.where("lower(#{attr}) LIKE lower(:query)", query: "%#{query}%")
+                search = search.where("lower(#{attr_prefixed}) LIKE lower(:query)", query: "%#{query}%")
               end
             end
           when 'date', 'datetime'
             if query.is_a?(String)
-              search = search.where("#{attr} = :query", query: query)
+              search = search.where("#{attr_prefixed} = :query", query: query)
             else
               if query['from'].present? || query['to'].present?
                 if query['from'].to_date != query['to'].to_date
                   if query['from'].present?
-                    search = search.where("#{attr} >= :query", query: query['from'].to_date)
+                    search = search.where("#{attr_prefixed} >= :query", query: query['from'].to_date)
                   end
                   if query['to'].present?
-                    search = search.where("#{attr} <= :query", query: query['to'].to_date)
+                    search = search.where("#{attr_prefixed} <= :query", query: query['to'].to_date)
                   end
                 else
-                  search = search.where("#{attr} = :query", query: query['from'].to_date)
+                  search = search.where("#{attr_prefixed} = :query", query: query['from'].to_date)
                 end
               end
             end
           when 'decimal', 'number', 'integer'
             if query.instance_of?(ActionController::Parameters)
               if query['from'].present? || query['to'].present?
-                search = search.where("#{attr} >= :query", query: query['from']) if query['from'].present?
-                search = search.where("#{attr} <= :query", query: query['to']) if query['to'].present?
+                search = search.where("#{attr_prefixed} >= :query", query: query['from']) if query['from'].present?
+                search = search.where("#{attr_prefixed} <= :query", query: query['to']) if query['to'].present?
               end
             else
               if attr_type == 'decimal' || attr_type == 'number'
@@ -263,10 +266,10 @@ module SlashAdmin
               elsif attr_type == 'integer'
                 query = query.to_i
               end
-              search = search.where("#{attr} = :query", query: query)
+              search = search.where("#{attr_prefixed} = :query", query: query)
             end
           when 'boolean'
-            search = search.where("#{attr} = :query", query: to_boolean(query))
+            search = search.where("#{attr_prefixed} = :query", query: to_boolean(query))
           else
             raise Exception.new("Unable to query for attribute_type : #{attr_type}")
           end

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = '1.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails