templus_models 3.0.10 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e33084424f911dea9ac45f2cb2bb30f11fadd74
-  data.tar.gz: 10c67dd7009704c1c30d597760522a1eb3d51446
+  metadata.gz: d86a4d7d8f4b7230ca8d19f69e5962beaa00675c
+  data.tar.gz: c62f496d5846326d3e8db95bdcaeb71f26afe34d
 SHA512:
-  metadata.gz: ea516b56ab9293307131f201cdd3ed655840790a887de435294d9a924b70034f430552d81bdbc5601ec152ec72ae163b0901cb83ca61ab7f99551f261196e9e8
-  data.tar.gz: bbf80c081f7d45735a93238abe1d4e50735958d3dc50f3372040a93a4a4db0f0a795a37ea472edbf71a4389c9b1d89f9708b1c64a522dcc12414ec199489927f
+  metadata.gz: 3ae34b100de5eaaf1bde33742452f26fcc3213e2221d5ab42210177aeaa06d777c15083652b9da2140852c87f6ea266fcf6e4d3b5639a611cb02eb44cfdda0e1
+  data.tar.gz: 2109533cc4c8cc866371fd653fe48c2d0147a40f7b80c751d794da87318ac34060e38d43368e1d78c7d642b7c85030b138ba4893e51f9ba2dc4507255ece860f

data/app/controllers/crud_controller.rb

@@ -17,9 +17,9 @@ class CrudController < ApplicationController
       end
     end
     if respond_to?(:current_usuario)
-      @records = @q.result.accessible_by(current_ability, :read).page(params[:page]).per(@crud_helper.per_page)
+      @records = @q.result(distinct: true).includes(@crud_helper.includes).accessible_by(current_ability, :read).page(params[:page]).per(@crud_helper.per_page)
     else
-      @records = @q.result.page(params[:page]).per(@crud_helper.per_page)
+      @records = @q.result(distinct: true).includes(@crud_helper.includes).page(params[:page]).per(@crud_helper.per_page)
     end
     @titulo = @model.name.pluralize
     render partial: 'records' if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
@@ -190,6 +190,7 @@ class CrudController < ApplicationController
   private
 
   def setup
+    params[:q] = convert_params(params[:q])
     if params[:associacao]
       @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
       if Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao])
@@ -214,7 +215,7 @@ class CrudController < ApplicationController
   end
 
   def params_permitt
-    params.require(@model.name.underscore.to_sym).permit(fields_model)
+    params.require(@model.name.underscore.gsub('/','_').to_sym).permit(fields_model)
   end
 
   def fields_model
@@ -268,7 +269,7 @@ class CrudController < ApplicationController
     end
     group
   end
-  
+
   def valid_method?(method)
     list_methods = []
     @model.ancestors.each do |m|
@@ -277,7 +278,7 @@ class CrudController < ApplicationController
     end
     list_methods.flatten.include? method.to_sym
   end
-  
+
   def valid_instance_method?(method)
     list_methods = []
     @model.ancestors.each do |m|
@@ -286,4 +287,16 @@ class CrudController < ApplicationController
     end
     list_methods.flatten.include? method.to_sym
   end
+
+  def convert_params(params)
+    if params.present? && params.class == String
+      hash = {}
+      params.split("&").each do |element|
+        result = element.split("?")[0].split("=")
+        hash[result[0]] = result[1]
+      end
+      params = ActionController::Parameters.new(hash)
+    end
+    params
+  end
 end

data/app/helpers/crud_helper.rb

@@ -234,6 +234,12 @@ module CrudHelper
     crud_helper.condition_printing_action.call(record)
   end
 
+  def add_params_page(url, page)
+    if page.present? && !url.include?("&")
+      url = url.include?("?") ? "#{url}&page=#{page}" : "#{url}?page=#{page}"
+    end
+    url
+  end
 
   private
 

data/app/helpers/search_helper.rb

@@ -78,11 +78,11 @@ module SearchHelper
     end
 
     def raro_input_as(name,type,opts)
+      if opts[:collection_if] and opts[:collection_if].class == Proc
+        opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval(&opts[:collection_if])
+      end
       case opts[:as]
       when :select
-        if opts[:collection_if] and opts[:collection_if].class == Proc
-          opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval &opts[:collection_if]
-        end
         raro_select(name,opts,opts[:collection])
       when :hidden
         return raro_hidden_field(name,opts[:value],opts)
@@ -92,6 +92,8 @@ module SearchHelper
         raro_range(name)
       when :monthyear
         raro_monthyear(name, opts)
+      when :check_boxes
+        raro_check_boxes(name, opts, opts[:collection])
       end
     end
 
@@ -105,6 +107,23 @@ module SearchHelper
       return raro_select("q[#{model_name}_id_eq]",opts,collection)
     end
 
+    def raro_check_boxes(name, opts, collection)
+      unless opts[:model]
+        name = "q[#{name}_eq]"
+      end
+      buf = "<div class='col-sm-12'>"
+      input_class = opts[:input_html].try(:[], :class)
+      collection.each do |e|
+        buf << "<span class='checkbox' style='display: inline;'>"
+        buf << "<label for='vaga_filtro_vaga_attributes_perfil_executor' class='control-label'>"
+        buf << "<input class='form-control check_boxes optional #{input_class}' type='checkbox' value='#{e[0]}' name='#{name}' style=''> #{e[1]}"
+        buf << '</label>'
+        buf << '</span>'
+      end
+      buf << '</div>'
+      return buf
+    end
+
     def raro_select(name,opts,collection)
       unless opts[:model]
         name = "q[#{name}_eq]"

data/app/raro_crud/raro_crud.rb

@@ -33,6 +33,7 @@ class RaroCrud
   @@scopes                    = {}
   @@menus                     = []
   @@layout                    = {}
+  @@includes                  = {}
   @@index_path                = nil
 
   def modelo
@@ -210,6 +211,10 @@ class RaroCrud
     @@menus
   end
 
+  def self.includes
+    @@includes[self.to_s.to_sym] || []
+  end
+
   def self.campo_visualizacao(nome, opts = {})
     @@view_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
@@ -409,6 +414,9 @@ class RaroCrud
     @@form_scripts[self.to_s.to_sym] << script.to_s
   end
 
+  def self.add_includes(includes)
+    @@includes[self.to_s.to_sym] = includes
+  end
 
   private
 

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

@@ -60,7 +60,7 @@
 			<div class="col-sm-4 col-sm-offset-2">
 				<%= f.submit I18n.t("save"), class: 'btn btn-primary'  %>
 				<%unless params[:render] == 'modal'%>
-					<%= link_to I18n.t("undo"), "#{@url}?page=#{params[:page]}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+					<%= link_to I18n.t("undo"), add_params_page(@url, params[:page]), class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 				<% end %>
 			</div>
 		</div>

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

@@ -79,69 +79,71 @@
 			<td class="row"></td>
 		<% end %>
 	<%end%>
-	<td class="row">
-		<div class="col-xs-9">
-			<% @crud_helper.actions.each do |action| %>
-				<% if ((action[:proc].present? && action[:proc].call(record)) || !action[:proc].present?) %>
-					<% if action[:options].present? && action[:options][:wiselink].present? && action[:options][:wiselink] %>
-						<% data = {push: "partial", target: "#form"} %>
+	<% if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present? || @crud_helper.actions_links.present? %>
+		<td class="row">
+			<div class="col-xs-9">
+				<% @crud_helper.actions.each do |action| %>
+					<% if (action[:proc].present? && action[:proc].call(record)) || !action[:proc].present? %>
+						<% if action[:options].present? && action[:options][:wiselink].present? && action[:options][:wiselink] %>
+							<% data = {push: "partial", target: "#form"} %>
+						<% end %>
+						<%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method]), class: "btn btn-primary btn-xs", data: data || {} %>
 					<% end %>
-					<%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method]), class: "btn btn-primary btn-xs", data: data || {} %>
 				<% end %>
-			<% end %>
-			<% @crud_helper.actions_links.each do |name, options| %>
-				<% unless (options[:can].present? && !record.instance_eval(&options[:can])) %>
-					<% if options[:url].present? %>
-						<% url = options[:url] %>
-						<% if options[:id] %>
-							<% url += options[:url].include?("?") ? "&id=#{record.id}" : "?id=#{record.id}" %>
-						<% else url.include?(":id") %>
-							<% url = url.gsub(":id", "#{record.id}") %>
-						<% end %>
-						<% if options[:wiselink].present? && options[:wiselink] %>
-							<a href="<%= url %>" class="btn btn-success btn-xs" data-push="partial" data-target="#form">
-								<%= I18n.t(name) %>
-							</a>
-						<% else %>
-							<a href="<%= url %>" class="btn btn-success btn-xs">
-								<%= I18n.t(name) %>
-							</a>
-						<% end %>
-					<% elsif options[:associacao].present? %>
-						<% if options[:wiselink].present? && options[:wiselink] %>
-							<%= link_to I18n.t(name), crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs", data: {push: "partial", target: "#form"} %>
-						<% else %>
-							<%= link_to I18n.t(name), crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs" %>
+				<% @crud_helper.actions_links.each do |name, options| %>
+					<% unless (options[:can].present? && !record.instance_eval(&options[:can])) %>
+						<% if options[:url].present? %>
+							<% url = options[:url] %>
+							<% if options[:id] %>
+								<% url += options[:url].include?("?") ? "&id=#{record.id}" : "?id=#{record.id}" %>
+							<% else url.include?(":id") %>
+								<% url = url.gsub(":id", "#{record.id}") %>
+							<% end %>
+							<% if options[:wiselink].present? && options[:wiselink] %>
+								<a href="<%= url %>" class="btn btn-success btn-xs" data-push="partial" data-target="#form">
+									<%= I18n.t(name) %>
+								</a>
+							<% else %>
+								<a href="<%= url %>" class="btn btn-success btn-xs">
+									<%= I18n.t(name) %>
+								</a>
+							<% end %>
+						<% elsif options[:associacao].present? %>
+							<% if options[:wiselink].present? && options[:wiselink] %>
+								<%= link_to I18n.t(name), crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs", data: {push: true, crumb: "wielka"} %>
+							<% else %>
+								<%= link_to I18n.t(name), crud_associacao_models_path(model: @model.name.underscore, id: record.id, associacao: options[:associacao].to_s), class: "btn btn-success btn-xs" %>
+							<% end %>
+						<% elsif options[:partial].present? %>
+							<%= render options[:partial], record: record, action: :index %>
 						<% end %>
-					<% elsif options[:partial].present? %>
-						<%= render options[:partial], record: record, action: :index %>
 					<% end %>
 				<% end %>
-			<% end %>
-			<% if @crud_helper.view_action && should_view?(@crud_helper, record) %>
-				<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-eye'></i>".html_safe : I18n.t("view") %>
-				<% if @crud_associacao.present? %>
-					<%= link_to link_text, crud_associacao_model_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
-				<% else %>
-					<%= link_to link_text, crud_model_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+				<% if @crud_helper.view_action && should_view?(@crud_helper, record) %>
+					<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-eye'></i>".html_safe : I18n.t("view") %>
+					<% if @crud_associacao.present? %>
+						<%= link_to link_text, crud_associacao_model_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+					<% else %>
+						<%= link_to link_text, crud_model_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+					<% end %>
 				<% end %>
-			<% end %>
-			<% if @crud_helper.edit_action && should_edit?(@crud_helper, record) %>
-				<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-edit'></i>".html_safe : I18n.t("edit") %>
-				<% if @crud_associacao.present? %>
-					<%= link_to link_text, edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
-				<% else %>
-					<%= link_to link_text, edit_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+				<% if @crud_helper.edit_action && should_edit?(@crud_helper, record) %>
+					<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-edit'></i>".html_safe : I18n.t("edit") %>
+					<% if @crud_associacao.present? %>
+						<%= link_to link_text, edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+					<% else %>
+						<%= link_to link_text, edit_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs', data: {push: 'partial', target: '#form'} %>
+					<% end %>
 				<% end %>
-			<% end %>
-			<% if @crud_helper.destroy_action && should_destroy?(@crud_helper, record) %>
-				<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-trash'></i>".html_safe : I18n.t("destroy") %>
-				<% if @crud_associacao.present? %>
-					<%= link_to link_text, destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
-				<% else %>
-					<%= link_to link_text, destroy_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
+				<% if @crud_helper.destroy_action && should_destroy?(@crud_helper, record) %>
+					<% link_text = TemplusModels.configuration.usar_icones ? "<i class='fa fa-trash'></i>".html_safe : I18n.t("destroy") %>
+					<% if @crud_associacao.present? %>
+						<%= link_to link_text, destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
+					<% else %>
+						<%= link_to link_text, destroy_crud_path(model: @model.name.underscore, id: record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
+					<% end %>
 				<% end %>
-			<% end %>
-		</div>
-	</td>
+			</div>
+		</td>
+	<% end %>
 <% end %>

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

@@ -24,7 +24,7 @@
               <% end %>
             </th>
           <% end %>
-          <% if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present? %>
+          <% if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present? || @crud_helper.actions_links.present? %>
             <td><%= I18n.t("simple_form.index.options", default: I18n.t("options")) %></td>
           <% end %>
         </tr>

data/lib/templus_models/version.rb

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

metadata

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