templus_models 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec26dfc7240381e3ba068b510a02b9765e23d69
-  data.tar.gz: 917dab50289ff467c0e4d3693efe7c36f0899cfa
+  metadata.gz: b1536520578bce0358a6fd84f1b85709011495fa
+  data.tar.gz: f32ca636fb1f375659b657d8f99584124507fb6a
 SHA512:
-  metadata.gz: ea400e28d502b904366c3456fa2494f60f9266915734ef94d20519b5522a9ce1495f9c6ef6f3bef78d3ba0eb5e1b093369dd2aabc7b9d23f56b118c6b5a141a7
-  data.tar.gz: 7ebc7b1c648d203a0719294db80612a297172e8b4c88d27b35afdcec89baa3a2cb035e5ba98baae96f15655d2fe6c471ed956d147fa322c696130525bb80639a
+  metadata.gz: 26af92dfbe251974f8fbd0aa35633034fb96960b3cfbe0e50fb8b07c702ad3dab8dd4a9fe8d8a0d4af723dce16402973004d2f5b0b1e0335b4eea4dbde699d42
+  data.tar.gz: ee1fd4987306a8b1f734bc6a69ffed10770698b502ab3013a3b769d18d1128895fadceb71beee01876720fae4d082a74920c9d760fad7d4f9681462f608fcca9

data/app/controllers/crud_controller.rb

@@ -8,10 +8,12 @@ class CrudController < ApplicationController
       @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
       c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
       @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
+      @model_permission = c_helper.constantize
       @url = "/crud/#{params[:model]}/#{params[:id]}/#{params[:associacao]}"
       @id = params[:associacao_id] if params[:associacao_id]
     else
       @model = Module.const_get(params[:model].camelize)
+      @model_permission = @model
       @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
       @url = "/crud/#{params[:model]}"
       @id = params[:id] if params[:id]
@@ -20,7 +22,7 @@ class CrudController < ApplicationController
   
   public
   def index
-    authorize! :read, @model if respond_to?(:current_usuario)
+    authorize! :read, @model_permission if respond_to?(:current_usuario)
     if params[:scope].present?
       @q = @model.send(params[:scope]).search(params[:q])
     else
@@ -49,10 +51,11 @@ class CrudController < ApplicationController
       else
         @model = params[:attribute].to_s.camelcase.constantize
       end
+      @model_permission = @model
       @url = "/crud/#{@model.name.underscore}"
       @crud_helper = Module.const_get("#{@model}Crud".camelize)
     end
-    authorize! :new, @model if respond_to?(:current_usuario)
+    authorize! :new, @model_permission if respond_to?(:current_usuario)
     @record = @model.new
   end
   
@@ -91,7 +94,7 @@ class CrudController < ApplicationController
       @saved = @record.update(params_permitt)
     else
       @record  =  @model.new(params_permitt)
-      authorize! :create, @model if respond_to?(:current_usuario)
+      authorize! :create, @model_permission if respond_to?(:current_usuario)
       @saved = @record.save
     end
     
@@ -131,7 +134,7 @@ class CrudController < ApplicationController
   end
   
   def query
-    authorize! :read, @model if respond_to?(:current_usuario)
+    authorize! :read, @model_permission if respond_to?(:current_usuario)
     @resource = @model
     @q = @resource.search(params[:q])
     @q.sorts = 'updated_at desc' if @q.sorts.empty?

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails