tramway-admin 1.32 → 1.32.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da3bc56fc776dfe427a596e31529b9f8c3c6f97db1db373931afb3e113c1ecdd
-  data.tar.gz: 4a8f36847d9ec84316bd18fa0633baf3c50177a9f29b4ef847a5c16bb683acfe
+  metadata.gz: dff80b796cc083c3bd26c9985b3369045d3ea8f983e978dfee3880fc550a443c
+  data.tar.gz: 15f65fae673edaff024ae501e3bbbbd864536f73cda32f4c79421ea2cbbee1af
 SHA512:
-  metadata.gz: ef3fceeab511ec3eea980f77ce39de35f6447c91e191f79563751704fbd45adb2949619b04eaad84516a952c21ad415a3fbe64efdc6c1540c82bd228ddfa4ff1
-  data.tar.gz: b73d51193a4ea7d0ed2810538146bc8154f29e7640a175356b4ab1dc71ef8ce8392908f77eabcf55ae5ad2453218b384d92c9b9336366ea44c31b7cefecedf0d
+  metadata.gz: 2f49d2bbc8a8962a5bd8f99ba38715ee78f37c478a7b025adfabb922afaad03b41c8384f1bb3440a7cfa2a486f2d8a4c1f91b7965f49c11b73d853f2c2c03236
+  data.tar.gz: 2ba60b25129fd4ec52e9d27044fa7f94bf42abd45bd22469f173f8ef30755794bfe6e3d285cbc00428b138939b8764dd54af21d38a404152719eb0a2d284d82f

data/README.md

@@ -1,13 +1,6 @@
 # Tramway::Admin
-Short description and motivation.
 
-## English readme
-
-*If you need translation of this Readme, please message us kalashnikov@ulmic.ru. We'll translate for you and post to this page*
-
-## Russian readme
-
-Готовая админка для проекта. Она подготовлена для работы со всеми tramway плагинами, а также поддерживает и ваши модели тоже.
+Create admin panel for your application FAST!
 
 ## Usage
 How to use my plugin.
@@ -18,7 +11,6 @@ How to use my plugin.
 ```ruby
 gem 'tramway-admin'
 gem 'tramway-auth'
-gem 'tramway-core'
 gem 'tramway-user'
 gem 'state_machine', github: 'seuros/state_machine'
 gem 'bcrypt'
@@ -102,24 +94,45 @@ Tramway::Admin.navbar_structure(
 *app/decorators/your_model_decorator.rb*
 ```ruby
 class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  decorate_associations :messages, :posts
+  
   class << self
     def collections
       [ :all, :scope1, :scope2 ]
     end
     
+    def list_attributes
+      [ :begin_date, :end_date ]
+    end
+    
+    def show_attributes
+      [ :begin_date, :end_date ]
+    end
+    
+    def show_associations
+      [ :messages ]
+    end
+    
     def list_filters
       {
         filter_name: {
+          type: :select,
           select_collection: filter_collection,
           query: lambda do |list, value|
             list.where some_attribute: value
           end
+        },
+        date_filter_name: {
+          type: :dates,
+          query: lambda do |list, begin_date, end_date|
+            list.where 'created_at > ? AND created_at < ?', begin_date, end_date
+          end
         }
       }
     end
   end
   
-  delegate :title, to: :object
+  delegate_attributes :title
 end
 ```
 
@@ -128,6 +141,35 @@ end
 * `list_filters` method returns hash of filters where:
   * select_collection - collection which will be in the select of filter. It must be compatible with [options_for_select](https://apidock.com/rails/ActionView/Helpers/FormOptionsHelper/options_for_select) method
   * query - some Active Record query which be used as a filter of records
+* `list_attributes` method returns array of attributes which will be shown in index page. If empty only `name` will be shown
+* `show_attributes` method returns array of attributes which will be shown in show page. If empty all attributes of the model will be shown
+* `show_associations` method returns array of decorated associations which will be show in show page. If empty no associations will be shown
+
+Filters naming:
+
+*Select filters*
+
+```yaml
+en:
+  tramway:
+    admin:
+      filters:
+        model_name:
+          filter_name: Your Filter
+```
+
+*Date filters*
+
+```yaml
+en:
+  tramway:
+    admin:
+      filters:
+        model_name:
+          date_filter_name:
+            begin_date: Your Begin date filter
+            end_date Your end date filter
+```
 
 #### 10. Add inheritance to YourModel
 

data/Rakefile

@@ -1,34 +1,10 @@
 # frozen_string_literal: true
 
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
+require 'rake'
+require 'rspec/core/rake_task'
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Tramway::Admin'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation'
 end
-
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task default: :test
+task default: :spec

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

@@ -5,7 +5,12 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     scope = params[:scope].present? ? params[:scope] : :all
     records = model_class.active.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search].present?
-    records = records.ransack(params[:filter]).result if params[:filter].present?
+    if params[:filter].present?
+      if params[:filter].is_a? String
+        params[:filter] = JSON.parse params[:filter]
+      end
+      records = records.ransack(params[:filter]).result 
+    end
     params[:list_filters]&.each do |filter, value|
       case decorator_class.list_filters[filter.to_sym][:type]
       when :select
@@ -14,7 +19,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

@@ -6,23 +6,30 @@
           = text_field_tag :search, params[:search], class: 'text form-control'
         = hidden_field_tag :model, params[:model]
         = hidden_field_tag :scope, params[:scope]
-        = hidden_field_tag :filter, params[:filter]
+        = hidden_field_tag :filter, (params[:filter].is_a?(ActionController::Parameters) ? params[:filter].permit!.to_h.to_json : params[:filter])
         - 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[: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[: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.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'tramway/core'
 require 'tramway/admin/engine'
 require 'tramway/admin/singleton_models'
 require 'tramway/admin/records_models'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.32'
+    VERSION = '1.32.1.3'
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '1.32'
+  version: 1.32.1.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tramway-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.3.5
+- !ruby/object:Gem::Dependency
+  name: tramway-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: tramway-user
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.3.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +196,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Engine for admin
 email:
 - kalashnikovisme@gmail.com