templus_models 2.0.12 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb8ba9975ee1f08a9420de3a78243cca0097454
-  data.tar.gz: 151bbdc9cfc59ec043a6ad40b8fc2457f9d44069
+  metadata.gz: fa21c229faa68ac0391b4c89acadf0052db3abbb
+  data.tar.gz: 1088f6449ad2850d571b9a32a5dd8fd53776e1a4
 SHA512:
-  metadata.gz: d76767de31c0b0f791087682d8427fab4fa40ce179d6a49a948f6bfe23dfcfa3e4268439afe302e255f3b4e7ffadf7fff91e52c8bb1785ac1ab89c8123e8d98c
-  data.tar.gz: 82731b159abfaa488b55dffeca1db13b17836f121b35868c95065945c6457777e86f01be557c03a783ffd7fbf29cb45e382c81b68983a85d6f70c301a56d64d7
+  metadata.gz: f11e309a014478406d44236ac2fc3b31ebbf2a20c04ee37b90054f7e562bdda6dbe2c716c71134a295b52ad8a9501780fd11e87197a95a81af330d1a6ee7927e
+  data.tar.gz: 760c77819cf75d0caf4b40143dd2649844674e2ff9e11d7ac070e5a75f4692a65e5ddece225dd56d9e0bd5a5c63393d6425fcd7be7b2574e147c7962dfe5277f

data/app/controllers/crud_controller.rb

@@ -1,7 +1,6 @@
 class CrudController < ApplicationController
   before_filter :setup, except: :autocomplete
 
-
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     if params[:scope].present? && valid_method?(params[:scope])
@@ -10,8 +9,8 @@ class CrudController < ApplicationController
       @q = @model.search(params[:q])
     end
     if @q.sorts.empty?
-      if "#{@crud_helper.order_field}".include?("desc") or "#{@crud_helper.order_field}".include?("asc")
-        @q.sorts = "#{@crud_helper.order_field}"
+      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
+        @q.sorts = @crud_helper.order_field.to_s
       else
         @q.sorts = "#{@crud_helper.order_field} asc"
       end
@@ -164,7 +163,13 @@ class CrudController < ApplicationController
     else
       @q = @model.search(params[:q])
     end
-
+    if @q.sorts.empty?
+      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
+        @q.sorts = @crud_helper.order_field.to_s
+      else
+        @q.sorts = "#{@crud_helper.order_field} asc"
+      end
+    end
     if respond_to?(:current_usuario)
       @records = @q.result.accessible_by(current_ability)
     else
@@ -193,9 +198,7 @@ class CrudController < ApplicationController
     end
   end
 
-
   private
-
   def generate_pdf_report(opts, layout)
     html = render_to_string(layout)
     options = {

data/app/helpers/search_helper.rb

@@ -134,7 +134,9 @@ module SearchHelper
       else
         buf << "<select name=#{name} class='form-control'>"
       end
-      buf << "<option value ='' selected>#{I18n.t('search')}</option>"
+      if opts[:include_blank].nil? || (!opts[:include_blank].nil? && ActiveRecord::Type::Boolean.new.type_cast_from_user(opts[:include_blank]))
+        buf << "<option value='' selected>#{I18n.t('search')}</option>"
+      end
       collection.each do |e|
         buf << "<option value=#{e[0]}>#{e[1]}</option>"
       end

data/app/raro_crud/raro_crud.rb

@@ -209,9 +209,6 @@ class RaroCrud
     @@menus
   end
 
-
-
-
   def self.campo_visualizacao(nome, opts = {})
     @@view_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
@@ -382,8 +379,6 @@ class RaroCrud
     @@form_scripts[self.to_s.to_sym] << script.to_s
   end
 
-
-
   private
 
   def self.modelo

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

@@ -13,16 +13,16 @@
         <% else %>
           <% url = query_crud_path(model: @model.name.underscore) %>
         <% end %>
-        <%=raro_search_form(@model, 'records','records', url, params[:scope]) do%>
-          <%raro_group "#{@crud_helper.title}"%>
-          <%@crud_helper.search_fields.each do |att| %>
+        <%= 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?%>
               <% if ((att[:sf][:visible_if].class == Proc && !att[:sf][:visible_if].call(att)) || (att[:sf][:visible_if].class != Proc && !att[:sf][:visible_if])) %>
                 <% next %>
               <% end %>
             <% end %>
-            <%raro_field att[:attribute], att[:sf]%>
-          <%end%>
+            <% raro_field att[:attribute], att[:sf] %>
+          <% end %>
         <%end%>
       </div>
     </div>

data/lib/templus_models/version.rb

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