admix 0.22.0 → 0.23.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/admix/inherited_controller.rb +13 -1
- data/lib/admix/version.rb +1 -1
- metadata +10 -10
|
@@ -1,11 +1,23 @@
|
|
|
1
1
|
module Admix
|
|
2
2
|
class InheritedController < Admix::AdmixController
|
|
3
|
+
helper :all
|
|
3
4
|
|
|
4
5
|
inherit_resources
|
|
6
|
+
include InheritedResources::DSL
|
|
7
|
+
|
|
8
|
+
rescue_from ActiveRecord::DeleteRestrictionError do |exception|
|
|
9
|
+
#resource.errors.add(:base, exception)
|
|
10
|
+
flash[:alert] = I18n.t('errors.dependent')
|
|
11
|
+
redirect_to collection_url
|
|
12
|
+
end
|
|
13
|
+
|
|
14
|
+
# destroy! do |success, failure|
|
|
15
|
+
# failure.html { redirect_to polymorphic_path(resource) }
|
|
16
|
+
# end
|
|
5
17
|
|
|
6
18
|
# TODO: Add authorization here.
|
|
7
19
|
|
|
8
|
-
|
|
20
|
+
|
|
9
21
|
|
|
10
22
|
before_filter :generate_datagrid , only: [:index ]
|
|
11
23
|
|
data/lib/admix/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: admix
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.23.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2013-02-
|
|
13
|
+
date: 2013-02-08 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|
|
@@ -35,7 +35,7 @@ dependencies:
|
|
|
35
35
|
requirements:
|
|
36
36
|
- - '='
|
|
37
37
|
- !ruby/object:Gem::Version
|
|
38
|
-
version: 0.
|
|
38
|
+
version: 0.23.0
|
|
39
39
|
type: :runtime
|
|
40
40
|
prerelease: false
|
|
41
41
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -43,7 +43,7 @@ dependencies:
|
|
|
43
43
|
requirements:
|
|
44
44
|
- - '='
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: 0.
|
|
46
|
+
version: 0.23.0
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: mix-rails-auth
|
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -51,7 +51,7 @@ dependencies:
|
|
|
51
51
|
requirements:
|
|
52
52
|
- - '='
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: 0.
|
|
54
|
+
version: 0.23.0
|
|
55
55
|
type: :runtime
|
|
56
56
|
prerelease: false
|
|
57
57
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -59,7 +59,7 @@ dependencies:
|
|
|
59
59
|
requirements:
|
|
60
60
|
- - '='
|
|
61
61
|
- !ruby/object:Gem::Version
|
|
62
|
-
version: 0.
|
|
62
|
+
version: 0.23.0
|
|
63
63
|
- !ruby/object:Gem::Dependency
|
|
64
64
|
name: mix-rails-settings
|
|
65
65
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -67,7 +67,7 @@ dependencies:
|
|
|
67
67
|
requirements:
|
|
68
68
|
- - '='
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
|
-
version: 0.
|
|
70
|
+
version: 0.23.0
|
|
71
71
|
type: :runtime
|
|
72
72
|
prerelease: false
|
|
73
73
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -75,7 +75,7 @@ dependencies:
|
|
|
75
75
|
requirements:
|
|
76
76
|
- - '='
|
|
77
77
|
- !ruby/object:Gem::Version
|
|
78
|
-
version: 0.
|
|
78
|
+
version: 0.23.0
|
|
79
79
|
- !ruby/object:Gem::Dependency
|
|
80
80
|
name: inherited_resources
|
|
81
81
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1263,7 +1263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
1263
1263
|
version: '0'
|
|
1264
1264
|
segments:
|
|
1265
1265
|
- 0
|
|
1266
|
-
hash:
|
|
1266
|
+
hash: 3139208101342844669
|
|
1267
1267
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1268
1268
|
none: false
|
|
1269
1269
|
requirements:
|
|
@@ -1272,7 +1272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1272
1272
|
version: '0'
|
|
1273
1273
|
segments:
|
|
1274
1274
|
- 0
|
|
1275
|
-
hash:
|
|
1275
|
+
hash: 3139208101342844669
|
|
1276
1276
|
requirements: []
|
|
1277
1277
|
rubyforge_project:
|
|
1278
1278
|
rubygems_version: 1.8.24
|