tramway-admin 1.31 → 1.32.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +52 -1
- data/app/assets/stylesheets/tramway/admin/application.sass +15 -0
- data/app/controllers/tramway/admin/application_controller.rb +14 -3
- data/app/controllers/tramway/admin/records_controller.rb +11 -2
- data/app/views/tramway/admin/records/_list.html.haml +2 -2
- data/app/views/tramway/admin/records/_search.html.haml +33 -13
- data/app/views/tramway/admin/records/index.html.haml +2 -1
- data/lib/tramway/admin/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e35624ddbaec0ee1d1fe553d65d077e6a4deb17d810faa186091f02321f0f12d
|
4
|
+
data.tar.gz: df7588e7dcb03f22cb106e4828eeb509bb048d7f9b4e8d553cb24a9d26368dd9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d017beaa83e62658848a8dbd35216fdfbe120cc97ffea7961e0d199249d58f966fbbc61ab073d6fcb92332bba4b55293263890cb1f99d3fc73f1b0914c0e3020
|
7
|
+
data.tar.gz: c90255345820994d0a31c9e963e2057f2b4c65f9a5ae298e01969807c6e3ff1e818d972569fdd4e4ab172f28a24b7bb065f47df76329903aa8901499d3b29df4
|
data/README.md
CHANGED
@@ -106,13 +106,46 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
|
|
106
106
|
def collections
|
107
107
|
[ :all, :scope1, :scope2 ]
|
108
108
|
end
|
109
|
+
|
110
|
+
def list_filters
|
111
|
+
{
|
112
|
+
filter_name: {
|
113
|
+
type: :select,
|
114
|
+
select_collection: filter_collection,
|
115
|
+
query: lambda do |list, value|
|
116
|
+
list.where some_attribute: value
|
117
|
+
end
|
118
|
+
},
|
119
|
+
date_filter_name: {
|
120
|
+
type: :dates,
|
121
|
+
query: lambda do |list, begin_date, end_date|
|
122
|
+
list.where 'created_at > ? AND created_at < ?', begin_date, end_date
|
123
|
+
end
|
124
|
+
}
|
125
|
+
}
|
126
|
+
end
|
109
127
|
end
|
110
128
|
|
111
129
|
delegate :title, to: :object
|
112
130
|
end
|
113
131
|
```
|
114
132
|
|
115
|
-
**
|
133
|
+
**NOTES:**
|
134
|
+
* `collections` method must return array of scopes of `YourModel`. Every collection will be a tab in a list of your model in admin panel
|
135
|
+
* `list_filters` method returns hash of filters where:
|
136
|
+
* 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
|
137
|
+
* query - some Active Record query which be used as a filter of records
|
138
|
+
|
139
|
+
Filters naming:
|
140
|
+
|
141
|
+
```yaml
|
142
|
+
en:
|
143
|
+
tramway:
|
144
|
+
admin:
|
145
|
+
filters:
|
146
|
+
model_name:
|
147
|
+
filter_name: You Filter
|
148
|
+
```
|
116
149
|
|
117
150
|
#### 10. Add inheritance to YourModel
|
118
151
|
|
@@ -140,6 +173,24 @@ class Admin::YourModelForm < Tramway::Core::ApplicationForm
|
|
140
173
|
end
|
141
174
|
end
|
142
175
|
```
|
176
|
+
|
177
|
+
### 12. You can add search to your index page
|
178
|
+
|
179
|
+
Tramway use gem [PgSearch](https://github.com/Casecommons/pg_search`) as search engine
|
180
|
+
|
181
|
+
Just add `search` method to `YourModel` like this
|
182
|
+
|
183
|
+
```ruby
|
184
|
+
search_by *attributes, **associations # `attributes` and `associations` should be the same syntax as in PgSearch
|
185
|
+
```
|
186
|
+
|
187
|
+
Example:
|
188
|
+
|
189
|
+
```ruby
|
190
|
+
class YourModel < Tramway::Core::ApplicationRecord
|
191
|
+
search_by :my_attribute, :another_attribute, my_association: [ :my_association_attribute, :another_my_association_attribute ]
|
192
|
+
```
|
193
|
+
|
143
194
|
#### 12. Run server `rails s`
|
144
195
|
#### 13. Launch `localhost:3000/admin`
|
145
196
|
|
@@ -31,3 +31,18 @@ td.actions
|
|
31
31
|
height: auto
|
32
32
|
max-height: 30em
|
33
33
|
overflow-x: hidden
|
34
|
+
|
35
|
+
.row-fluid.filters
|
36
|
+
width: 100%
|
37
|
+
display: flex
|
38
|
+
|
39
|
+
select
|
40
|
+
width: 100%
|
41
|
+
|
42
|
+
.submit
|
43
|
+
display: flex
|
44
|
+
flex-direction: row-reverse
|
45
|
+
|
46
|
+
.dates_filter
|
47
|
+
display: flex
|
48
|
+
flex-direction: row
|
@@ -34,8 +34,17 @@ module Tramway
|
|
34
34
|
records = records.send "#{current_admin.role}_scope", current_admin.id
|
35
35
|
records = records.ransack(params[:filter]).result if params[:filter].present?
|
36
36
|
params[:list_filters]&.each do |filter, value|
|
37
|
-
|
38
|
-
|
37
|
+
case decorator_class.list_filters[filter.to_sym][:type]
|
38
|
+
when :select
|
39
|
+
records = decorator_class.list_filters[filter.to_sym][:query].call(records, value) if value.present?
|
40
|
+
when :dates
|
41
|
+
begin_date = params[:list_filters][filter.to_sym][:begin_date]
|
42
|
+
end_date = params[:list_filters][filter.to_sym][:end_date]
|
43
|
+
if begin_date.present? && end_date.present?
|
44
|
+
if value.present?
|
45
|
+
records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
|
46
|
+
end
|
47
|
+
end
|
39
48
|
end
|
40
49
|
end
|
41
50
|
hash.merge! collection => records.count
|
@@ -97,7 +106,9 @@ module Tramway
|
|
97
106
|
# model: params[:model]
|
98
107
|
# )
|
99
108
|
# raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_admin.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
|
100
|
-
|
109
|
+
if params[:form].present?
|
110
|
+
Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '')
|
111
|
+
end
|
101
112
|
end
|
102
113
|
|
103
114
|
def available_scope_given?
|
@@ -7,8 +7,17 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
|
|
7
7
|
records = records.full_text_search params[:search] if params[:search].present?
|
8
8
|
records = records.ransack(params[:filter]).result if params[:filter].present?
|
9
9
|
params[:list_filters]&.each do |filter, value|
|
10
|
-
|
11
|
-
|
10
|
+
case decorator_class.list_filters[filter.to_sym][:type]
|
11
|
+
when :select
|
12
|
+
records = decorator_class.list_filters[filter.to_sym][:query].call(records, value) if value.present?
|
13
|
+
when :dates
|
14
|
+
begin_date = params[:list_filters][filter.to_sym][:begin_date]
|
15
|
+
end_date = params[:list_filters][filter.to_sym][:end_date]
|
16
|
+
if begin_date.present? && end_date.present?
|
17
|
+
if value.present?
|
18
|
+
records = decorator_class.list_filters[filter.to_sym][:query].call(records, begin_date, end_date)
|
19
|
+
end
|
20
|
+
end
|
12
21
|
end
|
13
22
|
end
|
14
23
|
records = records.send "#{current_admin.role}_scope", current_admin.id
|
@@ -19,9 +19,9 @@
|
|
19
19
|
= record.send attribute
|
20
20
|
%td.actions
|
21
21
|
.row
|
22
|
-
 
|
22
|
+
|
23
23
|
= link_to fa_icon('pencil-alt'), edit_current_model_record_path(record.id), class: 'btn btn-warning btn-xs'
|
24
|
-
 
|
24
|
+
|
25
25
|
= delete_button url: current_model_record_path(record.id), form_options: { class: :smart_button }, button_options: { class: 'btn btn-xs btn-danger' } do
|
26
26
|
= fa_icon 'trash-alt'
|
27
27
|
%br
|
@@ -1,15 +1,35 @@
|
|
1
1
|
- if searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
|
2
|
-
.col-md-
|
2
|
+
.col-md-8
|
3
3
|
.search
|
4
|
-
= form_tag records_path, method: :get do |f|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
-
|
13
|
-
|
14
|
-
|
15
|
-
|
4
|
+
= form_tag records_path, class: 'form-inline', method: :get do |f|
|
5
|
+
- if searchable_model?(model_class)
|
6
|
+
= text_field_tag :search, params[:search], class: 'text form-control'
|
7
|
+
= hidden_field_tag :model, params[:model]
|
8
|
+
= hidden_field_tag :scope, params[:scope]
|
9
|
+
= hidden_field_tag :filter, params[:filter]
|
10
|
+
- decorator_class(model_class).list_filters.each_slice(3) do |slice|
|
11
|
+
.row-fluid.filters
|
12
|
+
- slice.each do |filter|
|
13
|
+
- case filter[1][:type]
|
14
|
+
- when :select
|
15
|
+
.col-md-4
|
16
|
+
= label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}")
|
17
|
+
= select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
|
18
|
+
- when :dates
|
19
|
+
.col-md-8.dates_filter
|
20
|
+
.begin_date
|
21
|
+
= label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.begin_date")
|
22
|
+
= 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)
|
23
|
+
%span
|
24
|
+
\ -
|
25
|
+
.end_date
|
26
|
+
= label_tag t("admin.filters.#{model_class.to_s.underscore}.#{filter[0]}.end_date")
|
27
|
+
= 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)
|
28
|
+
:javascript
|
29
|
+
$(function () {
|
30
|
+
$('#filter_datepicker_begin_date').datepicker();
|
31
|
+
$('#filter_datepicker_end_date').datepicker();
|
32
|
+
});
|
33
|
+
.row-fluid.filters
|
34
|
+
.col-md-4.offset-md-8.submit
|
35
|
+
= submit_tag t('helpers.actions.search'), class: 'btn btn-primary'
|
@@ -5,7 +5,8 @@
|
|
5
5
|
- tabs = get_collection
|
6
6
|
.page-header
|
7
7
|
.row
|
8
|
-
.
|
8
|
+
- search_render_show = searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
|
9
|
+
%div{ class: "col-md-#{search_render_show ? 4 : 12}" }
|
9
10
|
%h1
|
10
11
|
= current_title
|
11
12
|
= link_to fa_icon(:plus), new_current_model_record_path, class: 'btn btn-primary'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tramway-admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 1.32.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pavel Kalashnikov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-06-
|
11
|
+
date: 2020-06-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bootstrap-kaminari-views
|