rails_admin_state 1.8.0 → 1.9.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
  SHA256:
3
- metadata.gz: a3dfba5319d0c88df1f3be75dd3e2ae8fa33b40b62455c134db782cc512b7869
4
- data.tar.gz: '0917cebc9cb29dc8aac1ab9ba6553cce676877dc1d00a2617883036a2dc69fc0'
3
+ metadata.gz: e542e4e4560dcff752fdf4e58c422fd82f5864015945e9263404fa33ebeea87b
4
+ data.tar.gz: 1162327194164c9e6eada3059d65810a386b373d31c89d3d1f28606e56ad7069
5
5
  SHA512:
6
- metadata.gz: 6927e33771eaec9dfabba5bb0fb7da1bc2de94d4b57351a65fd43b4dfef265e1bac060a6a0339c31f6698ee5bf945207b636f01315c6ff2871b7c3f3b18be43d
7
- data.tar.gz: c381c5efc393d480f54cff46797a61813b5d8f18e1eff72a41a3421560ef2bd995288f1badbb4ef85d580816ea9d6fa12c400907d9fb2780625d3f9cfcb2b67e
6
+ metadata.gz: 6e1d898c4e5b572e90b420decfd69791315b8668632b6abcab8d0049850ce6b7fd296710cd154c7132c1085799d6763db74f761f080920c1ecf5a5f26388d37b
7
+ data.tar.gz: 6a686f3dbbb8d486e9abb983c6b9af207a177cf1d29e042af4c8096687ba855969b05118efaf09c82cc97108b4c0484ad98021bbd2a9606c8c1c510ee97a3df2
@@ -39,7 +39,7 @@ module RailsAdmin
39
39
  end
40
40
  else
41
41
  if params['ajax'].present?
42
- render text: @object.errors.full_messages.join(', ')
42
+ render json: { error: @object.errors.full_messages.join(', ') }, status: 422
43
43
  else
44
44
  flash[:error] = @object.errors.full_messages.join(', ')
45
45
  end
@@ -47,14 +47,14 @@ module RailsAdmin
47
47
  rescue Exception => e
48
48
  Rails.logger.error e
49
49
  if params['ajax'].present?
50
- render text: I18n.t('admin.state_machine.error', err: e.to_s)
50
+ render json: { error: I18n.t('admin.state_machine.error', err: e.to_s) }, status: 422
51
51
  else
52
52
  flash[:error] = I18n.t('admin.state_machine.error', err: e.to_s)
53
53
  end
54
54
  end
55
55
  else
56
56
  if params['ajax'].present?
57
- render text: I18n.t('admin.state_machine.no_id')
57
+ render json: { error: I18n.t('admin.state_machine.no_id') }, status: 422
58
58
  else
59
59
  flash[:error] = I18n.t('admin.state_machine.no_id')
60
60
  end
@@ -129,7 +129,11 @@ module RailsAdmin
129
129
  },
130
130
  error: function(e) {
131
131
  $t.html(old_html);
132
- alert(e.responseText);
132
+ if(e.responseJSON && e.responseJSON.error) {
133
+ alert(e.responseJSON.error);
134
+ } else {
135
+ alert(e.responseText);
136
+ }
133
137
  }
134
138
  });
135
139
  return false;
@@ -1,3 +1,3 @@
1
1
  module RailsAdminState
2
- VERSION = "1.8.0"
2
+ VERSION = "1.9.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_admin_state
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.0
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-10 00:00:00.000000000 Z
11
+ date: 2019-01-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails_admin