tramway-admin 1.32.0.1 → 1.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ae44ca35830b2da4ed0a9d58887ab9da4e5422d79cc1c055950d25b50d348a6
-  data.tar.gz: 49e9923821a7995e714016c35ae3b87cd410859218b6230b3d92f90d92d9e69a
+  metadata.gz: e35624ddbaec0ee1d1fe553d65d077e6a4deb17d810faa186091f02321f0f12d
+  data.tar.gz: df7588e7dcb03f22cb106e4828eeb509bb048d7f9b4e8d553cb24a9d26368dd9
 SHA512:
-  metadata.gz: d83925eb840eaa03df35b3b55f84229b1be0c52d3e500b05e9bc826d06ebec5cf1c0c0620cf695c6144b473fa6b87219223de5ec5350952b1296322669ccb793
-  data.tar.gz: 8f49db5d5bbd00419f3c15310e8fb73730062512ea91d0184175e37e17f5718a35017cffdc913261e9c843b5297438876ade41971d4434aff830eb8e9b989553
+  metadata.gz: d017beaa83e62658848a8dbd35216fdfbe120cc97ffea7961e0d199249d58f966fbbc61ab073d6fcb92332bba4b55293263890cb1f99d3fc73f1b0914c0e3020
+  data.tar.gz: c90255345820994d0a31c9e963e2057f2b4c65f9a5ae298e01969807c6e3ff1e818d972569fdd4e4ab172f28a24b7bb065f47df76329903aa8901499d3b29df4

data/app/assets/stylesheets/tramway/admin/application.sass

@@ -42,3 +42,7 @@ td.actions
   .submit
     display: flex
     flex-direction: row-reverse
+
+  .dates_filter
+    display: flex
+    flex-direction: row

data/app/controllers/tramway/admin/application_controller.rb

@@ -41,7 +41,9 @@ module Tramway
               begin_date = params[:list_filters][filter.to_sym][:begin_date]
               end_date = params[:list_filters][filter.to_sym][:end_date]
               if begin_date.present? && end_date.present?
-                records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date) if value.present?
+                if value.present?
+                  records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
+                end
               end
             end
           end

data/app/controllers/tramway/admin/records_controller.rb

@@ -14,7 +14,9 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
         begin_date = params[:list_filters][filter.to_sym][:begin_date]
         end_date = params[:list_filters][filter.to_sym][:end_date]
         if begin_date.present? && end_date.present?
-          records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date) if value.present?
+          if value.present?
+            records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
+          end
         end
       end
     end

data/app/views/tramway/admin/records/_search.html.haml

@@ -10,19 +10,26 @@
         - decorator_class(model_class).list_filters.each_slice(3) do |slice|
           .row-fluid.filters
             - slice.each do |filter|
-              .col-md-4
-                = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}")
-                - case filter[1][:type]
-                - when :select
+              - case filter[1][:type]
+              - when :select
+                .col-md-4
+                  = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}")
                   = select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
-                - when :dates
-                  = text_field_tag "list_filters[#{filter[0]}][begin_date]", '', class: 'form-control', id: 'filter_datepicker_begin_date', value: params.dig(:list_filters, filter[0], :begin_date)
-                  = text_field_tag "list_filters[#{filter[0]}][end_date]", '', class: 'form-control', id: 'filter_datepicker_end_date', value: params.dig(:list_filters, filter[0], :end_date)
-                  :javascript
-                    $(function () {
-                      $('#filter_datepicker_begin_date').datepicker();
-                      $('#filter_datepicker_end_date').datepicker();
-                    });
+              - when :dates
+                .col-md-8.dates_filter
+                  .begin_date
+                    = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.begin_date")
+                    = text_field_tag "list_filters[#{filter[0]}][begin_date]", '', class: 'form-control', id: 'filter_datepicker_begin_date', value: params.dig(:list_filters, filter[0], :begin_date)
+                  %span
+                    \ -
+                  .end_date
+                    = label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.end_date")
+                    = text_field_tag "list_filters[#{filter[0]}][end_date]", '', class: 'form-control', id: 'filter_datepicker_end_date', value: params.dig(:list_filters, filter[0], :end_date)
+                :javascript
+                  $(function () {
+                    $('#filter_datepicker_begin_date').datepicker();
+                    $('#filter_datepicker_end_date').datepicker();
+                  });
         .row-fluid.filters
           .col-md-4.offset-md-8.submit
             = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.32.0.1'
+    VERSION = '1.32.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.32.0.1
+  version: 1.32.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views