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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1645552ccbd39d33a80c250f8e627270ec5041d1530721a45801b1174c9fc878
4
- data.tar.gz: 42fdd04cb23a2cfa1886a70d38c369b99fff2ded9e6d683fc30e9713a0ed05c8
3
+ metadata.gz: 23705635d5b62ff9ad7ee8d50fc5b5f81f836c9cffbc1b8a30963e1c663490fe
4
+ data.tar.gz: 82243f1481c1b3501dd222d8b67e9823330f3a9928ecfd5ac138e22658580984
5
5
  SHA512:
6
- metadata.gz: 98c0a7e9252b9947bfae38bd52369b5afcb59bf413399827b12f2f2db93884c7515c84d88bdc5be09105f29b70a439823741e2e4a92e6bff0a6a8242979aa6fc
7
- data.tar.gz: f6b49dcacb04265304bf8413902cac45e7c4b3f457c6575d1b76155616b7aaded6f7521cc4d71a7e044886cc0e0e94cab96cb728ddde484b0751e54db4d7f3d9
6
+ metadata.gz: 0d79eb5563d055b03f246fba77e304e6ee74ed0585dc07ffba0455320100b2df903aeed3c9e7e584bcb5fc3c98f481a57d012753ae7cc4683006b738aa604533
7
+ data.tar.gz: 3c5ef74ca5f99511d0a0c5341d1fb04cf6035e632b598cffe112751bf6bd2ada4ab1fa12f5058cde4d8bc1cdd047d52915a6e0f752fdd84e05f0785c205af601
@@ -9,3 +9,4 @@ en:
9
9
  link: "Discard"
10
10
  bulk_link: "Discard selected %{model_label_plural}"
11
11
  done: "Discarded"
12
+ unremoved: "%{model_label} has rolled back"
@@ -36,14 +36,22 @@ module RailsAdmin
36
36
  proc do
37
37
  if request.get? # DELETE
38
38
 
39
- respond_to do |format|
40
- format.html { render @action.template_name }
41
- format.js { render @action.template_name, layout: false }
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
@@ -1,3 +1,3 @@
1
1
  module RailsAdminDiscard
2
- VERSION = '0.1.1'
2
+ VERSION = '0.1.2'
3
3
  end
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.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-20 00:00:00.000000000 Z
11
+ date: 2020-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails