templus_models 3.0.12 → 3.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/crud_controller.rb +5 -1
- data/app/helpers/search_helper.rb +6 -7
- data/app/views/crud/_search.html.erb +1 -1
- data/lib/templus_models/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 599fc4c702a8e03706fe1237d7596a252b23e1c1
|
4
|
+
data.tar.gz: 54c5350bc61712bd5b981bda2a8edfd1818ea8a1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3d76b7da4125981bf52c8cb402889e25eacca4886dc1dc1457d4cbde8acbd31f7ca92c3acb9fe3a08a74a88cbfd38a34f3f46b9d6a68df0c5e8892d785ce2dcf
|
7
|
+
data.tar.gz: 4c184c1a561e0a59b14a40ef4187d9f248b39ecb76d2b321f10be1993a1f35d5cccf98ff5feecb7ff2b7bad6553c016c0a96f3f902543128786bf5c07d86b32f
|
@@ -118,7 +118,11 @@ class CrudController < ApplicationController
|
|
118
118
|
def query
|
119
119
|
authorize! :read, @model_permission if respond_to?(:current_usuario)
|
120
120
|
@resource = @model
|
121
|
-
|
121
|
+
if params[:scope].present? && valid_method?(params[:scope])
|
122
|
+
@q = @model.send(params[:scope]).search(params[:q])
|
123
|
+
else
|
124
|
+
@q = @model.search(params[:q])
|
125
|
+
end
|
122
126
|
@q.sorts = 'updated_at desc' if @q.sorts.empty?
|
123
127
|
if respond_to?(:current_usuario)
|
124
128
|
results = @q.result.accessible_by(current_ability).page(params[:page])
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module SearchHelper
|
2
2
|
|
3
|
-
def raro_search_form(model,partial,collection_name,url,sort = nil)
|
4
|
-
@buffer = raro_before_form(model,partial,collection_name,url,sort)
|
3
|
+
def raro_search_form(model, partial, collection_name, url, scope = nil, sort = nil)
|
4
|
+
@buffer = raro_before_form(model, partial, collection_name, url, scope, sort)
|
5
5
|
@model = model
|
6
6
|
yield
|
7
7
|
@buffer << raro_submit(I18n.t('search'))
|
@@ -240,15 +240,14 @@ module SearchHelper
|
|
240
240
|
buffer
|
241
241
|
end
|
242
242
|
|
243
|
-
def raro_before_form(model,partial,var,url,sort)
|
243
|
+
def raro_before_form(model, partial, var, url, scope, sort)
|
244
244
|
buffer = "<div id='search_box'>"+
|
245
245
|
"<form method='get' class=form-horizontal action='#{url}' data-push='partial' data-target='#form'>" +
|
246
246
|
"<input type='hidden' name='partial' value='#{partial}'>" +
|
247
247
|
"<input type='hidden' name='var' value='#{var}'>"
|
248
|
-
if sort
|
249
|
-
|
250
|
-
|
251
|
-
buffer
|
248
|
+
buffer << "<input type='hidden' name='q[s]' value='#{sort}'>" if sort.present?
|
249
|
+
buffer << "<input type='hidden' name='scope' value='#{scope}'>" if scope.present?
|
250
|
+
buffer
|
252
251
|
end
|
253
252
|
|
254
253
|
def raro_after_form
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<% else %>
|
14
14
|
<% url = query_crud_path(model: @model.name.underscore) %>
|
15
15
|
<% end %>
|
16
|
-
<%= raro_search_form(@model, 'records','records', url) do %>
|
16
|
+
<%= raro_search_form(@model, 'records','records', url, params[:scope]) do %>
|
17
17
|
<% raro_group "#{@crud_helper.title}" %>
|
18
18
|
<% @crud_helper.search_fields.each do |att| %>
|
19
19
|
<% if att[:sf].present? && !att[:sf][:visible_if].nil? %>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: templus_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rodrigo Sol
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2017-
|
13
|
+
date: 2017-10-13 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rails
|
@@ -980,7 +980,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
980
980
|
version: '0'
|
981
981
|
requirements: []
|
982
982
|
rubyforge_project:
|
983
|
-
rubygems_version: 2.6.
|
983
|
+
rubygems_version: 2.6.13
|
984
984
|
signing_key:
|
985
985
|
specification_version: 4
|
986
986
|
summary: Easy CRUD generator for Rails Projects
|