templus_models 3.0.12 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86a4d7d8f4b7230ca8d19f69e5962beaa00675c
-  data.tar.gz: c62f496d5846326d3e8db95bdcaeb71f26afe34d
+  metadata.gz: 599fc4c702a8e03706fe1237d7596a252b23e1c1
+  data.tar.gz: 54c5350bc61712bd5b981bda2a8edfd1818ea8a1
 SHA512:
-  metadata.gz: 3ae34b100de5eaaf1bde33742452f26fcc3213e2221d5ab42210177aeaa06d777c15083652b9da2140852c87f6ea266fcf6e4d3b5639a611cb02eb44cfdda0e1
-  data.tar.gz: 2109533cc4c8cc866371fd653fe48c2d0147a40f7b80c751d794da87318ac34060e38d43368e1d78c7d642b7c85030b138ba4893e51f9ba2dc4507255ece860f
+  metadata.gz: 3d76b7da4125981bf52c8cb402889e25eacca4886dc1dc1457d4cbde8acbd31f7ca92c3acb9fe3a08a74a88cbfd38a34f3f46b9d6a68df0c5e8892d785ce2dcf
+  data.tar.gz: 4c184c1a561e0a59b14a40ef4187d9f248b39ecb76d2b321f10be1993a1f35d5cccf98ff5feecb7ff2b7bad6553c016c0a96f3f902543128786bf5c07d86b32f

data/app/controllers/crud_controller.rb

@@ -118,7 +118,11 @@ class CrudController < ApplicationController
   def query
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     @resource = @model
-    @q = @resource.search(params[:q])
+    if params[:scope].present? && valid_method?(params[:scope])
+      @q = @model.send(params[:scope]).search(params[:q])
+    else
+      @q = @model.search(params[:q])
+    end
     @q.sorts = 'updated_at desc' if @q.sorts.empty?
     if respond_to?(:current_usuario)
       results = @q.result.accessible_by(current_ability).page(params[:page])

data/app/helpers/search_helper.rb

@@ -1,7 +1,7 @@
 module SearchHelper
 
-  def raro_search_form(model,partial,collection_name,url,sort = nil)
-      @buffer = raro_before_form(model,partial,collection_name,url,sort)
+  def raro_search_form(model, partial, collection_name, url, scope = nil, sort = nil)
+      @buffer = raro_before_form(model, partial, collection_name, url, scope, sort)
       @model = model
       yield
       @buffer << raro_submit(I18n.t('search'))
@@ -240,15 +240,14 @@ module SearchHelper
       buffer
     end
 
-    def raro_before_form(model,partial,var,url,sort)
+    def raro_before_form(model, partial, var, url, scope, sort)
       buffer = "<div id='search_box'>"+
       "<form method='get' class=form-horizontal action='#{url}' data-push='partial' data-target='#form'>" +
       "<input type='hidden' name='partial' value='#{partial}'>" +
       "<input type='hidden' name='var' value='#{var}'>"
-      if sort
-         buffer << "<input type='hidden' name='q[s]' value='#{sort}'>"
-       end
-       buffer
+      buffer << "<input type='hidden' name='q[s]' value='#{sort}'>" if sort.present?
+      buffer << "<input type='hidden' name='scope' value='#{scope}'>" if scope.present?
+      buffer
     end
 
     def raro_after_form

data/app/views/crud/_search.html.erb

@@ -13,7 +13,7 @@
         <% else %>
           <% url = query_crud_path(model: @model.name.underscore) %>
         <% end %>
-        <%= raro_search_form(@model, 'records','records', url) do %>
+        <%= raro_search_form(@model, 'records','records', url, params[:scope]) do %>
           <% raro_group "#{@crud_helper.title}" %>
           <% @crud_helper.search_fields.each do |att| %>
             <% if att[:sf].present? && !att[:sf][:visible_if].nil? %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.12"
+  VERSION = "3.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -980,7 +980,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects