templus_models 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa21c229faa68ac0391b4c89acadf0052db3abbb
-  data.tar.gz: 1088f6449ad2850d571b9a32a5dd8fd53776e1a4
+  metadata.gz: c4c3261e33c32d29539818bc4f9df911b5ea8105
+  data.tar.gz: 0eed8196e4d499761c82238ed5843f99c6c84b4d
 SHA512:
-  metadata.gz: f11e309a014478406d44236ac2fc3b31ebbf2a20c04ee37b90054f7e562bdda6dbe2c716c71134a295b52ad8a9501780fd11e87197a95a81af330d1a6ee7927e
-  data.tar.gz: 760c77819cf75d0caf4b40143dd2649844674e2ff9e11d7ac070e5a75f4692a65e5ddece225dd56d9e0bd5a5c63393d6425fcd7be7b2574e147c7962dfe5277f
+  metadata.gz: 5d6d65de90ec66af6bbc6bd221757061cf28a3ed562f5decdf9dcb915282e0ae5e829c20eb7b9be1148fd4454c8f12d45977dc717418ea22502367d68c913c60
+  data.tar.gz: df420b44e56be37579c29a69cfcdfd8546234de5d03a40e79deb7a76d198f6b92be744f6adc27c1971c8f0f2b5194c07860b33b9746f42f87f5fc3fbe8f9d68a

data/app/controllers/crud_controller.rb

@@ -8,6 +8,7 @@ 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
@@ -15,10 +16,11 @@ class CrudController < ApplicationController
         @q.sorts = "#{@crud_helper.order_field} asc"
       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.accessible_by(current_ability, :read).uniq.page(params[:page]).per(@crud_helper.per_page)
     else
-      @records = @q.result.page(params[:page]).per(@crud_helper.per_page)
+      @records = @q.result.uniq.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?
@@ -123,11 +125,13 @@ class CrudController < ApplicationController
       @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])
+      results = @q.result.accessible_by(current_ability).uniq.page(params[:page])
     else
-      results = @q.result.page(params[:page])
+      results = @q.result.uniq.page(params[:page])
     end
+
     instance_variable_set("@#{params[:var]}", results)
     if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
       render :partial => params[:partial]
@@ -144,9 +148,9 @@ class CrudController < ApplicationController
     @q = @model.search(parametros)
     @q.sorts = 'updated_at desc' if @q.sorts.empty?
     if respond_to?(:current_usuario)
-      results = @q.result.accessible_by(current_ability).page(params[:page])
+      results = @q.result.accessible_by(current_ability).uniq.page(params[:page])
     else
-      results = @q.result.page(params[:page])
+      results = @q.result.uniq.page(params[:page])
     end
     if valid_instance_method?(params[:label])
       method_label = params[:label]
@@ -163,6 +167,7 @@ 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
@@ -170,10 +175,11 @@ class CrudController < ApplicationController
         @q.sorts = "#{@crud_helper.order_field} asc"
       end
     end
+    
     if respond_to?(:current_usuario)
-      @records = @q.result.accessible_by(current_ability)
+      @records = @q.result.uniq.accessible_by(current_ability)
     else
-      @records = @q.result
+      @records = @q.result.uniq
     end
     report_name = "#{@crud_helper.title}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|

data/lib/templus_models/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 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: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -981,7 +981,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