tramway-admin 1.32.1.2 → 1.32.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dee5f088f753288890da09af68a6f8aab3b0d2370e6d94a6dc6e81b1bb17017
-  data.tar.gz: 3deb15305b766085f0613ab29833f53c201c845dc4149a91b1ef318d7d071e51
+  metadata.gz: dff80b796cc083c3bd26c9985b3369045d3ea8f983e978dfee3880fc550a443c
+  data.tar.gz: 15f65fae673edaff024ae501e3bbbbd864536f73cda32f4c79421ea2cbbee1af
 SHA512:
-  metadata.gz: f9ae53792e9fbd87d56d771025b274e857216697846bd6a84ca3ef157768aced9dc634efff9397f554c000760be1134a894bcc4d35ab5f67b287e996a56601b7
-  data.tar.gz: 647c711d44088f38df6605cf166b2f671826423be4baf403f40c759538cf789bc0660c203a155fa1340c9b1f2da0418a81689935d4b94138173c6a5156d181da
+  metadata.gz: 2f49d2bbc8a8962a5bd8f99ba38715ee78f37c478a7b025adfabb922afaad03b41c8384f1bb3440a7cfa2a486f2d8a4c1f91b7965f49c11b73d853f2c2c03236
+  data.tar.gz: 2ba60b25129fd4ec52e9d27044fa7f94bf42abd45bd22469f173f8ef30755794bfe6e3d285cbc00428b138939b8764dd54af21d38a404152719eb0a2d284d82f

data/README.md

@@ -94,11 +94,25 @@ 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: {
@@ -118,7 +132,7 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
     end
   end
   
-  delegate :title, to: :object
+  delegate_attributes :title
 end
 ```
 
@@ -127,6 +141,9 @@ 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:
 

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

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

@@ -6,7 +6,7 @@
           = 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|

data/lib/tramway/admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.32.1.2
+  version: 1.32.1.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core