admin_it 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3c78b05180f3886708f8ebb99413ae49d655d1d
-  data.tar.gz: 777702fc5bc52596130f80447c686859460d442f
+  metadata.gz: 45f2f0b918cc7598db68bfa95c9531166582e32f
+  data.tar.gz: 20beca7ce9441e4e9daf07193b683d2cce03fdbf
 SHA512:
-  metadata.gz: 8d1eca80d0a17486ef98a48c0d74bd5b146c37b04b4ffa98849231077bad3f73f0a2bc5368da5ff58b39427e82811ee8604a01494258084ac228938a37499c13
-  data.tar.gz: 3b51e836dc3cd9742b06e33a479f48e2f4d4a8af7e525eda044361ce838e797b86e82b37fd5982327e3d845efe96793e049d6fea792cd7156acb352720056122
+  metadata.gz: f3c96628072ee5f826f3363d3f46c0d35913af0f04d63f33cdcb38162c106c533535a32cf3705bfe2dd862086cfcd9ee03c4cc7cb704adf4e115c16e7f1af931
+  data.tar.gz: bab6e0655d1a46847110bea8721ff19ad182e8f5cf516633de1b3edf83a635be1c6ad700c8cb4360f45f384492e5ed51cc8307b2dbd78aa181636262699cd78d

data/app/views/admin_it/context/_table.html.slim

@@ -13,18 +13,25 @@
         - opts[:class] = 'text-info' if for_context.sorting.any? { |s| s.index("#{k}:") == 0 }
         = header.cell opts do
           = h
-          - v_filter = for_context.filters.select do |f|
-            - f.is_a?(AdminIt::ValueFilter) && f.class.field == for_context.field(k)
+          - filter_class = for_context.all_filters(scope: :value).find do |f|
+            - f.field.field_name == k
+          - unless filter_class.nil?
+            - active_filter = for_context.filters.find { |f| f.is_a?(filter_class) }
+            - if !active_filter.nil? && !active_filter.values.empty?
+              a class="btn btn-success btn-xs pull-right" href==for_context.url_for(filters: "-#{filter_class.filter_name}")
+                i class="fa fa-filter"
+                = ' '
+                i class="fa fa-times-circle-o text-danger"
           - if for_context.sortable.include?(k) || !v_filter.nil?
             div class="btn-group btn-group-xs pull-right fade" data-toggle="popup-target"
               - unless for_context.sorting.include?("#{k}:asc")
-                a class="btn btn-default" href==url_for(for_context.url_params(sorting: "#{k}:asc"))
+                a class="btn btn-default" href==for_context.url_for(sorting: "#{k}:asc")
                   i class="fa fa-caret-down"
               - unless for_context.sorting.include?("#{k}:desc")
-                a class="btn btn-default" href==url_for(for_context.url_params(sorting: "#{k}:desc"))
+                a class="btn btn-default" href==for_context.url_for(sorting: "#{k}:desc")
                   i class="fa fa-caret-up"
-              - unless v_filter.nil?
-                a class="btn btn-info" href="#"
+              - if !filter_class.nil? && (active_filter.nil? || active_filter.values.empty?)
+                a class="btn btn-info" href==for_context.url_for(filters: "+#{filter_class.filter_name}", active_filter: filter_class.filter_name)
                   i class="fa fa-filter"
       - if for_context.actions?
         th style='border: none'

data/app/views/admin_it/shared/_toolbar.html.slim

@@ -27,4 +27,5 @@
         span class="caret"
       ul class="dropdown-menu" role="menu"
         - for_context.all_filters.each do |filter|
-          li: a href==url_for(filters: filter.filter_name) =filter.display_name
+          li: a href==for_context.url_for(filters: filter.filter_name)
+            = filter.display_name

data/lib/admin_it/context/collection_context.rb

@@ -93,8 +93,8 @@ module AdminIt
       end
     end
 
-    def all_filters
-      self.class.filters
+    def all_filters(scope: :all)
+      self.class.filters(scope: scope)
     end
 
     def filters

data/lib/admin_it/context/context.rb

@@ -202,6 +202,11 @@ module AdminIt
       params
     end
 
+    def url_for(*args, **params)
+      return nil if @template.nil?
+      @template.url_for(*args, url_params(**params))
+    end
+
     protected
 
     def context_param

data/lib/admin_it/data/active_record.rb

@@ -1,7 +1,9 @@
 module AdminIt
   module ActiveRecordData
     module Resource
-      def display_name
+      protected
+
+      def default_display_name
         entity_class
           .model_name
           .human#(count: 0)
@@ -10,8 +12,6 @@ module AdminIt
           .join(' ')
       end
 
-      protected
-
       def default_fields(&block)
         enum = Enumerator.new do |yielder|
           exclude = []

data/lib/admin_it/filters/filter.rb

@@ -226,6 +226,7 @@ module AdminIt
     def filters(scope: :all)
       case scope
       when nil, :all then @filters.values
+      when :value then @filters.values.select { |f| f <= ValueFilter }
       else @filters.values
       end
     end

data/lib/admin_it/resource.rb

@@ -126,7 +126,7 @@ module AdminIt
     end
 
     def display_name
-      @display_name ||= plural.split('_').map { |s| s.capitalize }.join(' ')
+      @display_name ||= i18n_display_name || default_display_name
     end
 
     def collection_path
@@ -211,6 +211,22 @@ module AdminIt
       []
     end
 
+    def default_display_name
+      plural.split('_').map { |s| s.capitalize }.join(' ')
+    end
+
+    def i18n_display_name
+      begin
+        I18n
+          .t!("admin_it.resources.#{name}.display_name.plural")
+          .split(' ')
+          .map { |s| s.mb_chars.capitalize }
+          .join(' ')
+      rescue I18n::MissingTranslationData
+        nil
+      end
+    end
+
     private
 
     def import_data_module

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/extend_it/dsl.rb

@@ -144,15 +144,10 @@ module ExtendIt
 
         define_method "use_#{hash_name}" do |*names, except: nil|
           hash = dsl_get(variable || hash_name, {})
-#          puts "---< #{names}, except: #{except} #{hash.inspect}"
           keys = hash.keys
           names = Dsl.expand_asterisk(names.ensure_symbols, keys)
-#          puts "---> #{names}"
           names = names.empty? ? keys : names & keys
-#          puts "---> #{names}"
           names -= except.ensure_symbols
-#          puts "---> #{names}"
-#          puts ''
           hash.replace(Hash[names.map { |n| [n, hash[n]] }])
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Alexey Ovchinnikov