cancancan_resource_controller 1.0.2 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cancancan/abstract_resource_controller.rb +21 -10
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 62a696db74dbddbc518c54bff5cd423e4ae8429d2e3a7b02de751cd6c1a89d9c
|
|
4
|
+
data.tar.gz: 44992376a7f3a3ae5041023048b27a7c8f0bcee4252050fe85de059aa9309e3c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a41161e3b15480fbc5a5a8b21dcb5520dcdb7b16a34e440b1c7fb23661076f867ed4962525e7b39ef5d8ab25fc4977b15ce041d49e617db715bcd6951223c9f5
|
|
7
|
+
data.tar.gz: 7dec4957a61312d6e99d57c59eb91da6acfafe3aa3e7ca08914263b991e33efa8a8faf5ba6e147954f5314abaf514f06dc5a24b003317e0ef10fc45525400dfe
|
|
@@ -94,10 +94,27 @@ module CanCanCan
|
|
|
94
94
|
|
|
95
95
|
def new
|
|
96
96
|
authorize! :create, @resource_class
|
|
97
|
-
@resource ||= @resource_class.new
|
|
98
|
-
authorize! :create, @resource
|
|
97
|
+
@resource ||= @resource_class.new
|
|
99
98
|
|
|
100
|
-
|
|
99
|
+
service = CanCanCan::AssignmentAndAuthorization.new(
|
|
100
|
+
current_ability,
|
|
101
|
+
action_name,
|
|
102
|
+
@resource,
|
|
103
|
+
clean_parameter_data(params)
|
|
104
|
+
)
|
|
105
|
+
|
|
106
|
+
if service.call
|
|
107
|
+
respond_with_resource
|
|
108
|
+
else
|
|
109
|
+
begin
|
|
110
|
+
Rails.logger.warn "Failed object validations: could not new #{@resource_class}: #{@resource.errors.full_messages}"
|
|
111
|
+
respond_with_resource_invalid
|
|
112
|
+
rescue Exception => e
|
|
113
|
+
Rails.logger.error "CanCanCanResourceController - Caught Internal Server Error: " + e.class.to_s + ': ' + e.message
|
|
114
|
+
Rails.logger.error Rails.backtrace_cleaner.clean(e.backtrace).join("\n").to_s
|
|
115
|
+
respond_with_resource_error
|
|
116
|
+
end
|
|
117
|
+
end
|
|
101
118
|
end
|
|
102
119
|
|
|
103
120
|
def edit
|
|
@@ -105,13 +122,7 @@ module CanCanCan
|
|
|
105
122
|
@resource ||= @resource_class.find(params[:id])
|
|
106
123
|
authorize! :update, @resource
|
|
107
124
|
|
|
108
|
-
|
|
109
|
-
format.html # Renders the default
|
|
110
|
-
format.json { render json: @resources }
|
|
111
|
-
format.xml { render xml: @resources }
|
|
112
|
-
format.csv # Renders the default
|
|
113
|
-
format.xlsx # Renders the default
|
|
114
|
-
end
|
|
125
|
+
respond_with_resource
|
|
115
126
|
end
|
|
116
127
|
|
|
117
128
|
def create
|