rails_admin_grid 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e762946cdb2225a14ead81c9b1d6eee13e8722
-  data.tar.gz: 551a48bceeae5d9b572ce8f700662e8907ac17df
+  metadata.gz: 8c4f08e190fc53acc1e6b62550716852709a30f2
+  data.tar.gz: 9845b65a29e9b89b0be5471b429f8a7e405404e3
 SHA512:
-  metadata.gz: e75a2d2477b4ff1ca7ae3283d8271f8c6a894b635d6e7ea3d4312093ebe26e23e5290beae8e9f955c4e508d4060017c4996d8b491a328bd03074defd39bd0493
-  data.tar.gz: df3ffb6849b3914bc52bc42dc9b6c478bc8fcb38b14306142f2c2c3194c1f8548f286151f72b6827683199aa8429b58df02accbcca967bd07491bf344d2e7183
+  metadata.gz: d42cd6b41010edd8a55f87144c27a59f29fca39ae83d7f1f52862d02886e90bd0d244a8d28ba1ccbb6b8ed586a47a6d10f46e913ab4bbb8c8b180bce8fe36b5d
+  data.tar.gz: 098774a8607be3c4baee1935b8c26bf8789b6ad7727e09f7b6a6be993ed4d3b7661cdfd8cff901d0a7a2bd74b6e4b4a8e1b79d5b753b355df7921f6a5e43e1f6

data/app/views/rails_admin/main/grid.html.haml

@@ -1,5 +1,4 @@
 :ruby
-  require 'rails_admin/config/fields/types/datetime.rb'
   query = params[:query]
   params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export, :_pjax)
   params.delete(:query) if params[:query].blank?
@@ -7,107 +6,62 @@
   sort_reverse = params[:sort_reverse]
   sort = params[:sort]
   params.delete(:sort) if params[:sort] == @model_config.grid.sort_by.to_s
-
   export_action = RailsAdmin::Config::Actions.find(:export, { controller: self.controller, abstract_model: @abstract_model })
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
-
   description = RailsAdmin.config(@abstract_model.model_name).description
   properties = @model_config.grid.with(controller: self.controller, view: self, object: @abstract_model.model.new).visible_fields
   # columns paginate
-  @filterable_fields = @model_config.grid.fields.select(&:filterable?)
   sets = get_column_sets(properties)
   properties = sets[params[:set].to_i] || []
   other_left = ((params[:set].to_i - 1) >= 0) && sets[params[:set].to_i - 1].present?
   other_right = sets[params[:set].to_i + 1].present?
-  @index = 0
-  @ordered_filters = (params[:f] || @model_config.grid.filters).inject({}) { |memo, filter|
-    field_name = filter.is_a?(Array) ? filter.first : filter
-  (filter.is_a?(Array) ? filter.last : { (@index += 1) => { "v" => '' } }) .each do |index, filter_hash|
-      unless filter_hash['disabled']
-        memo[index] = { field_name => filter_hash }
-      else
-        params[:f].delete(field_name)
-      end
-    end
-    memo
-  }.to_a.sort_by(&:first)
-
-  @ordered_filter_string = @ordered_filters.map do |duplet|
-    filter_index = duplet[0]
-    filter_for_field = duplet[1]
-    filter_name = filter_for_field.keys.first
-    filter_hash = filter_for_field.values.first
-    field = @filterable_fields.find{ |field| field.name == filter_name.to_sym }
-    unless field
-      fail "#{filter_name} is not currently filterable; filterable fields are #{@filterable_fields.map(&:name).join(', ')}"
-    end
-    field_options = case field.type
-    when :enum
-      options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
-    else
-      ''
-    end
-    %{
-      $.filters.append(#{field.label.to_json}, #{field.name.to_json}, #{field.type.to_json}, #{filter_hash['v'].to_json}, #{filter_hash['o'].to_json}, #{field_options.to_json}, #{filter_index.to_json});
-    }
-  end.join.html_safe if @ordered_filters
-
 
-= content_for :contextual_tabs do
+- content_for :contextual_tabs do
   = bulk_menu
-  - if @filterable_fields.present?
+  - if filterable_fields.present?
     %li.dropdown{style: 'float:right'}
       %a.dropdown-toggle{href: '#', :'data-toggle' => "dropdown"}
         = t('admin.misc.add_filter')
         %b.caret
       %ul.dropdown-menu#filters{style: 'left:auto; right:0;'}
-        - @filterable_fields.each do |field|
+        - filterable_fields.each do |field|
           - field_options = case field.type
           - when :enum
             - options_for_select(field.with(object: @abstract_model.model.new).enum)
           - else
             - ''
           %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => ""}= capitalize_first_letter(field.label)
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
 
-#list
-  %script
-    jQuery(function($) {
-    $.filters.options.regional = {
-    datePicker: {
-    dateFormat: #{raw I18n.t("admin.misc.filter_date_format", default: I18n.t("admin.misc.filter_date_format", locale: :en)).to_json},
-    dayNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.day_names.to_json},
-    dayNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
-    dayNamesMin: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
-    firstDay: "1",
-    monthNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.month_names.to_json},
-    monthNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_month_names.to_json}
-    }
-    }
 
-    = @ordered_filter_string
+:javascript
+  jQuery(function($) {
+  #{ordered_filter_string}
+  });
 
-    });
-  %style
-    - properties.select{ |p| p.column_width.present? }.each do |property|
-      = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
-      = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
-  :css
-    .center-vert {
-      position: relative;
-      top: 50%;
-      transform: translateY(-50%);
-    }
+%style
+  - properties.select{ |p| p.column_width.present? }.each do |property|
+    = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
+    = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
+:css
+  .center-vert {
+    position: relative;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+#list
   = form_tag(grid_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
     .well
       %span#filters_box
-      %hr.filters_box{style: "display:#{@ordered_filters.empty? ? 'none' : 'block'}"}
+      %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
       .input-group
         %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
         %span.input-group-btn
           %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
             %i.icon-white.icon-refresh
             = t("admin.misc.refresh")
+          %button#remove_filter.btn.btn-info{title: "Reset filters"}
+            %i.icon-white.icon-remove
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
 
@@ -121,7 +75,8 @@
   = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
     = hidden_field_tag :bulk_action
     - if description.present?
-      <b>#{description}</b>
+      %p
+        %strong= description
 
     .container-fluid
       - @objects.each_slice(4) do |object_row|
@@ -152,5 +107,6 @@
       .row
         .col-md-6= link_to(t("admin.misc.show_all"), grid_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"
+
     - else
-      .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"
+      .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"

data/lib/rails_admin_grid/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminGrid
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Colavita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.8.0
 description: RailsAdminGrid is a custom action for RailsAdmin that displays objects
   in a grid with thumbnails. It provides an alternative to the default list view provided
   in RailsAdmin.