templus_models 3.0.14 → 3.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d430cf39c020a63c9cf7e16b248a1ee4c71c040
-  data.tar.gz: cf28b29eb8f4d46fa53a1cd6cf84663f3b1f94d1
+SHA256:
+  metadata.gz: 9d204588df378b19fe94813b2c24a13488a170704bdcac58ae5ae05142dea5d9
+  data.tar.gz: 24451ee6c17c9d3c4daf338a20c69ee46f83998654581e89fd9d103282a4c379
 SHA512:
-  metadata.gz: 2fb6d1d75db08aa1656e3d8ed3216a3b0a85180fc83319e018f1da91f60b5380ad0b0b30ba61b6d9c1c1fedad6c3a23a18bd5668bd2cd9b3a469442aa7fb9b82
-  data.tar.gz: 12aa1d2ad34d7d1c8c7374571edadf76d78488542748beb085c6bc3a0e6d392f5f66b351d237df669ad0b2fd2bf1d02dcb951249d52831ecc33ef85e8944e850
+  metadata.gz: abc0e462c6a9708283070512d56af53e9207980eea46039de1f9d2aed553e8b6db00b061d29e8430c3572a79ebe7780c6cafe3faba18505278315919309e7283
+  data.tar.gz: 5ed074ec1685c94f8dc69b48752232d7d58fed6c26f3e42f103c173cd90b74eaba5ea165740713118e4c3c8954e992161882fb2ab9c79b3e345330636bcc1236

data/app/controllers/crud_controller.rb

@@ -60,7 +60,7 @@ class CrudController < ApplicationController
       else
         flash.now[:error] = I18n.t("mensagem_erro_action", acao: params[:acao])
       end
-      redirect_to "#{@url}?page=#{params[:page]}"
+      redirect_to @url
     else
       @titulo = @record.to_s
       @texto = params[:acao]
@@ -83,7 +83,7 @@ class CrudController < ApplicationController
     respond_to do |format|
       if @saved
         flash[:success] = params[:id].present? ? I18n.t("updated", model: I18n.t("model.#{@model.name.underscore}")) : I18n.t("created", model: I18n.t("model.#{@model.name.underscore}"))
-        format.html { redirect_to "#{@url}?page=#{params[:page]}" }
+        format.html { redirect_to @url }
         unless params[:render] == 'modal'
           format.js { render action: :index}
         else
@@ -211,9 +211,7 @@ class CrudController < ApplicationController
     end
   end
 
-
   private
-
   def setup
     params[:q] = convert_params(params[:q])
     if params[:associacao]
@@ -299,7 +297,7 @@ class CrudController < ApplicationController
     list_methods = []
     @model.ancestors.each do |m|
       list_methods << m.methods(false).reject{ |m| /^_/ =~ m.to_s }
-      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.superclass.to_s
+      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.try(:superclass).to_s
     end
     list_methods.flatten.include? method.to_sym
   end
@@ -308,7 +306,7 @@ class CrudController < ApplicationController
     list_methods = []
     @model.ancestors.each do |m|
       list_methods << m.instance_methods(false).reject{ |m| /^_/ =~ m.to_s }
-      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.superclass.to_s
+      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.try(:superclass).to_s
     end
     list_methods.flatten.include? method.to_sym
   end

data/app/helpers/crud_helper.rb

@@ -234,13 +234,6 @@ 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
 
   def pdf_image_tag(field, options = {})

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"), add_params_page(@url, params[:page]), class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+					<%= link_to I18n.t("undo"), @url, class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 				<% end %>
 			</div>
 		</div>

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

@@ -87,7 +87,7 @@
 						<% 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 || {} %>
+						<%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method], page: params[:page], q: params[:q]), class: "btn btn-primary btn-xs", data: data || {} %>
 					<% end %>
 				<% end %>
 				<% @crud_helper.actions_links.each do |name, options| %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.14"
+  VERSION = "3.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.17
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -980,7 +980,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects