templus_models 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dfa4871df0259f538bedc70333fd4d51f8b997d
-  data.tar.gz: b4745585cf0769114562a7bd6b9a0ecb070ff4e0
+  metadata.gz: fcb8ba9975ee1f08a9420de3a78243cca0097454
+  data.tar.gz: 151bbdc9cfc59ec043a6ad40b8fc2457f9d44069
 SHA512:
-  metadata.gz: 3fb34a5a5bbc3885e10f6be6807daadbe955ec77aa61e76d70ce129d8082c035cc8065b1f5eeb9dba6829c41ab08d48ea9ab6e76aa79ffa86510adb1d1c7715e
-  data.tar.gz: b86b4f0ec6bef0c25abb8b1f344927e3d98d56f193ad56a81c2fadfe214d58f94bba386fedde6b4677d79f158d56de57ecf73e86d1328b62cbe66b94331a2e04
+  metadata.gz: d76767de31c0b0f791087682d8427fab4fa40ce179d6a49a948f6bfe23dfcfa3e4268439afe302e255f3b4e7ffadf7fff91e52c8bb1785ac1ab89c8123e8d98c
+  data.tar.gz: 82731b159abfaa488b55dffeca1db13b17836f121b35868c95065945c6457777e86f01be557c03a783ffd7fbf29cb45e382c81b68983a85d6f70c301a56d64d7

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])
@@ -155,7 +159,12 @@ class CrudController < ApplicationController
 
   def listing
     authorize! :read, @model_permission if respond_to?(:current_usuario)
-    @q = @model.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
+
     if respond_to?(:current_usuario)
       @records = @q.result.accessible_by(current_ability)
     else

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,14 +240,13 @@ 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 << "<input type='hidden' name='q[s]' value='#{sort}'>" if sort.present?
+      buffer << "<input type='hidden' name='scope' value='#{scope}'>" if scope.present?
       buffer
     end
 

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/app/views/crud/_shared.html.erb

@@ -38,11 +38,11 @@
               <% if params[:associacao] %>
                 <% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model_permission) %>
 
-                  <%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
+                  <%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], scope: params[:scope], q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
                     <%= I18n.t("devise.reports.excel").html_safe %>
                   <% end if should_listing_excel?(@crud_helper, @model_permission) %>
 
-                  <%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
+                  <%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], scope: params[:scope], format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
                     <%= I18n.t("devise.reports.pdf").html_safe %>
                   <% end if should_listing_pdf?(@crud_helper, @model_permission) %>
 
@@ -50,11 +50,11 @@
               <% else %>
                 <% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model) %>
 
-                  <%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
+                  <%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], scope: params[:scope], format: :xls), class: "btn btn-success btn-rounded" do %>
                     <%= I18n.t("devise.reports.excel").html_safe %>
                   <% end if should_listing_excel?(@crud_helper, @model) %>
 
-                  <%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], target: '_blank', format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
+                  <%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], scope: params[:scope], target: '_blank', format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
                     <%= I18n.t("devise.reports.pdf").html_safe %>
                   <% end if should_listing_pdf?(@crud_helper, @model) %>
 

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "2.0.11"
+  VERSION = "2.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails