rails_admin_discard 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/locales/discard.en.yml +1 -0
- data/lib/rails_admin_discard.rb +12 -4
- data/lib/rails_admin_discard/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 23705635d5b62ff9ad7ee8d50fc5b5f81f836c9cffbc1b8a30963e1c663490fe
|
4
|
+
data.tar.gz: 82243f1481c1b3501dd222d8b67e9823330f3a9928ecfd5ac138e22658580984
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0d79eb5563d055b03f246fba77e304e6ee74ed0585dc07ffba0455320100b2df903aeed3c9e7e584bcb5fc3c98f481a57d012753ae7cc4683006b738aa604533
|
7
|
+
data.tar.gz: 3c5ef74ca5f99511d0a0c5341d1fb04cf6035e632b598cffe112751bf6bd2ada4ab1fa12f5058cde4d8bc1cdd047d52915a6e0f752fdd84e05f0785c205af601
|
data/lib/rails_admin_discard.rb
CHANGED
@@ -36,14 +36,22 @@ module RailsAdmin
|
|
36
36
|
proc do
|
37
37
|
if request.get? # DELETE
|
38
38
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
end
|
39
|
+
if @object.discarded?
|
40
|
+
flash[:error] = t('admin.discard.unremoved', model_label: @model_config.label)
|
41
|
+
@object.undiscard
|
43
42
|
|
43
|
+
redirect_to index_path
|
44
|
+
else
|
45
|
+
respond_to do |format|
|
46
|
+
format.html { render @action.template_name }
|
47
|
+
format.js { render @action.template_name, layout: false }
|
48
|
+
end
|
49
|
+
end
|
44
50
|
elsif request.delete? # DESTROY
|
45
51
|
redirect_path = nil
|
46
52
|
@auditing_adapter && @auditing_adapter.delete_object(@object, @abstract_model, _current_user)
|
53
|
+
|
54
|
+
|
47
55
|
if @object.discard
|
48
56
|
flash[:success] = t('admin.flash.successful', name: @model_config.label, action: t('admin.actions.delete.done'))
|
49
57
|
redirect_path = index_path
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rails_admin_discard
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dayves
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-01-
|
11
|
+
date: 2020-01-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|