express_admin 1.7.28 → 1.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b516340a35967fe889a0b444dbcaffba32b37391
-  data.tar.gz: 48d9ed2620e2d914b96341a1270702133964dc83
+  metadata.gz: ef8cec8a16d8b19753bb84b13648532cf14f696f
+  data.tar.gz: 47d9fe386d1018d71caa8548da23340b16f92c18
 SHA512:
-  metadata.gz: 29a40ae6919f23c5b068bfe2a147b1ae556b7f0daddc70397bf3d46c7a56db2e7aed2c048b5af549dd8f172ef9bf08ff66118a19d91f325a8d3adde102d2d844
-  data.tar.gz: 2520ed01ae603ca06d3d83c5ad67844a4df190f2e588698de9ed213f8271cbf6657eada3892be8836987f6b93760baa13c13fb5c900c34b37231b510a52acb39
+  metadata.gz: fe38c39fc5686864203803f68ae1611a89c324bac1c96411d1cb1961fc06511463b176b54bd64396fda049ae43f8078fcda8f872d02ed247322b48ae4bdc1321
+  data.tar.gz: 4d38dd9c209e8f3149ad44d9cd4110fdc22c5615518b9c3bf0bac949181d368559cdc9331ee69923bd10397c46d66316aeadca0039a348a40fd0875b05e01413

data/app/assets/stylesheets/express_admin/components/_filter.sass

@@ -0,0 +1,17 @@
+.filter-tag
+  a
+    color: white
+    font-size: 1.2em
+  text-transform: none
+
+.filter-criteria
+  float: right
+  display: block
+  margin-left: 1em
+  margin-right: 1em
+  margin-top: 1em
+
+.content-title
+  display: inline
+  float: left
+  padding-left: 8px

data/app/assets/stylesheets/express_admin/screen.sass

@@ -25,6 +25,7 @@
 @import 'components/smart_table'
 @import 'components/label'
 @import 'components/image'
+@import 'components/filter'
 
 @import 'shared/media_object'
 @import 'shared/breadcrumbs'

data/app/components/express_admin/collection_filter.rb

@@ -0,0 +1,31 @@
+module ExpressAdmin
+  module Components
+    module Controls
+      class CollectionFilter < ExpressTemplates::Components::Configurable
+        include ExpressTemplates::Components::Capabilities::Resourceful
+
+          tag :span
+
+          before_build {
+            add_class 'filter-criteria'
+          }
+
+          contains -> {
+            if _filter_column
+              text_node "Filter: "
+              span(class: 'label filter-tag') { 
+                icon_link(:'android-cancel', text: helpers.params[:filter][_filter_column],
+                                             href: log_entries_path(filter: {}),
+                                             right: true)
+              }
+            end
+          }
+
+          private
+            def _filter_column
+              helpers.params[:filter].try(:keys).try(:first)
+            end
+      end
+    end
+  end
+end

data/lib/express_admin/standard_actions.rb

@@ -237,14 +237,33 @@ module ExpressAdmin
                   else
                     resource_class
                   end
-          scope = search?(scope)
-          scope = instance_variable(scope)
-          scope = params[:asc] || params[:desc] ? sort_table(scope) : scope
-          self.instance_variable_set(collection_ivar, scope)
+          filtered_scope = filter(scope)  # TODO: Removed the conditionally invoked .all
+          # scope = params[:asc] || params[:desc] ? sort_table(scope) : scope
+          self.instance_variable_set(collection_ivar, filtered_scope)
         end
 
-        def instance_variable(scope)
-          scope.kind_of?(Array) ? scope : scope.all
+        def filter(scope)
+          if _filter_field
+            scope.kind_of?(Array) ? _array_filter(scope) : _sql_filter(scope)
+          else
+            scope
+          end
+        end
+
+        def _filter_field
+          params[:filter] ? params[:filter].keys.first : nil
+        end
+
+        def _filter_value
+          params[:filter][_filter_field]
+        end
+
+        def _array_filter(list)
+          list.select {|item| item.send(_filter_field).eql?(_filter_value)}
+        end
+
+        def _sql_filter(scope)
+          scope.where(_filter_field.to_sym => _filter_value)
         end
 
         def sort_table(scope)
@@ -257,6 +276,7 @@ module ExpressAdmin
           end
         end
 
+        # TODO: Refactor.
         def search?(scope)
           params[:search_string].present? ? search(scope) : scope
         end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.28"
+  VERSION = "1.7.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.28
+  version: 1.7.29
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates
@@ -399,6 +399,7 @@ files:
 - app/assets/stylesheets/express_admin/components/_command_button.sass
 - app/assets/stylesheets/express_admin/components/_definition.sass
 - app/assets/stylesheets/express_admin/components/_empty_state.sass
+- app/assets/stylesheets/express_admin/components/_filter.sass
 - app/assets/stylesheets/express_admin/components/_h_box.sass
 - app/assets/stylesheets/express_admin/components/_image.sass
 - app/assets/stylesheets/express_admin/components/_label.sass
@@ -438,6 +439,7 @@ files:
 - app/assets/stylesheets/express_admin/shared/_widgets.sass
 - app/assets/stylesheets/ionicons/ionicons.scss
 - app/components/express_admin/code_editor.rb
+- app/components/express_admin/collection_filter.rb
 - app/components/express_admin/command_button.rb
 - app/components/express_admin/command_button_list.rb
 - app/components/express_admin/country_select.rb
@@ -647,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: ExpressAdmin provides an admin menu framework based on Foundation.