inline_forms 3.1.9 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b37424b939adb9381a5052834c8d5bd4b1d667d2
|
4
|
+
data.tar.gz: 2bb9b00f6b6403db88be0999afb68578beda7856
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d33062038a1812ed6b57469ec5e7f3c99276a73f269e80b7e2950a18a361ae94d7c4759e0aab9f43981bfb8547252b96502af195262bab83a7630085d8b7840d
|
7
|
+
data.tar.gz: 16a70f235d23f49f2685a6a4c7030eea768fb43cd288d6fa1c5243a90986f0845ae677bb04067fd84c8854164459c1934f2f20696e8b7f0ae64b62ed4e87c794
|
@@ -197,9 +197,16 @@ class InlineFormsController < ApplicationController
|
|
197
197
|
def destroy
|
198
198
|
@update_span = params[:update]
|
199
199
|
@object = @Klass.find(params[:id])
|
200
|
-
|
201
|
-
|
202
|
-
|
200
|
+
if current_user.role? :superadmin
|
201
|
+
@object.destroy
|
202
|
+
respond_to do |format|
|
203
|
+
format.js { render :show_undo }
|
204
|
+
end
|
205
|
+
elsif (@Klass.safe_deletable? rescue false)
|
206
|
+
@object.safe_delete(current_user)
|
207
|
+
respond_to do |format|
|
208
|
+
format.js { render :close }
|
209
|
+
end
|
203
210
|
end
|
204
211
|
end
|
205
212
|
|
@@ -207,12 +214,20 @@ class InlineFormsController < ApplicationController
|
|
207
214
|
# Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
|
208
215
|
def revert
|
209
216
|
@update_span = params[:update]
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
217
|
+
if current_user.role? :superadmin
|
218
|
+
@version = PaperTrail::Version.find(params[:id])
|
219
|
+
@version.reify.save!
|
220
|
+
@object = @Klass.find(@version.item_id)
|
221
|
+
authorize!(:revert, @object) if cancan_enabled?
|
222
|
+
respond_to do |format|
|
223
|
+
format.js { render :close }
|
224
|
+
end
|
225
|
+
elsif (@Klass.safe_deletable? rescue false)
|
226
|
+
@object = @Klass.find(params[:id])
|
227
|
+
@object.safe_restore
|
228
|
+
respond_to do |format|
|
229
|
+
format.js { render :close }
|
230
|
+
end
|
216
231
|
end
|
217
232
|
end
|
218
233
|
|
@@ -32,14 +32,34 @@ module InlineFormsHelper
|
|
32
32
|
|
33
33
|
# destroy link
|
34
34
|
def link_to_destroy( object, update_span )
|
35
|
-
if
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
35
|
+
if current_user.role? :superadmin
|
36
|
+
if cancan_disabled? || ( can? :delete, object )
|
37
|
+
link_to "<i class='fi-trash'></i>".html_safe,
|
38
|
+
send( object.class.to_s.underscore + '_path',
|
39
|
+
object,
|
40
|
+
:update => update_span ),
|
41
|
+
:method => :delete,
|
42
|
+
:remote => true,
|
43
|
+
:title => t('inline_forms.view.trash')
|
44
|
+
end
|
45
|
+
elsif (object.class.safe_deletable? rescue false)
|
46
|
+
if object.deleted? && (cancan_disabled? || ( can? :revert, object ))
|
47
|
+
link_to "undelete".html_safe,
|
48
|
+
send( 'revert_' + object.class.to_s.underscore + '_path',
|
49
|
+
object,
|
50
|
+
:update => update_span ),
|
51
|
+
:method => :post,
|
52
|
+
:remote => true,
|
53
|
+
:title => t('inline_forms.view.trash')
|
54
|
+
elsif !object.deleted? && (cancan_disabled? || ( can? :delete, object ))
|
55
|
+
link_to "<i class='fi-trash'></i>".html_safe,
|
56
|
+
send( object.class.to_s.underscore + '_path',
|
57
|
+
object,
|
58
|
+
:update => update_span ),
|
59
|
+
:method => :delete,
|
60
|
+
:remote => true,
|
61
|
+
:title => t('inline_forms.view.trash')
|
62
|
+
end
|
43
63
|
end
|
44
64
|
end
|
45
65
|
|
data/lib/inline_forms/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: inline_forms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ace Suares
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-10-
|
11
|
+
date: 2016-10-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rvm
|