my_admin 0.0.4 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/app/controllers/my_admin/models_controller.rb +1 -1
- data/app/helpers/my_admin_field_helper.rb +3 -3
- data/app/views/my_admin/fields/edit/type/has_and_belongs_to_many.html.erb +1 -1
- data/app/views/my_admin/fields/edit/type/has_many.html.erb +1 -1
- data/app/views/my_admin/fields/edit/type/has_many_edit.html.erb +2 -2
- data/app/views/my_admin/fields/edit/type/has_many_locale.html.erb +1 -1
- data/app/views/my_admin/fields/edit/type/read_only.html.erb +1 -1
- data/lib/my_admin/version.rb +1 -1
- data/my_admin.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NTQzYzBiY2MyZWVjZjEyZWVmODcyMDFmOGY1MTliMGY0ZTgxZDIzOA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MGE2OTkzZDYzODRjNjlmY2MwZTIwNjVkOGU5ZjdiZDU1YjhkNmQ5Nw==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YTMzNjdkYzY0Yjk4NDlkMTE4ZmMzNDUzYzJmNDNjZTNiNzg4Y2NjZTllZmFk
|
10
|
+
NmZlOTJiMDQyYjZiYzI0ZDJjOGJlYTc1ODM3NzcyM2RmYjY2NWMzYTNhZmQ3
|
11
|
+
ZGFkN2I1MTA1ZGRkZDhkNmQ2YmQyNDU1NjYzY2M3ODRmNDBkZDA=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZjQyZjkwMjYxNjM4MTE3ZjU4ZmEzMjAzNGZlZDAxMjdjZWFiNWUxNGM3ZjUy
|
14
|
+
ZDMyMjMwMTBkYmQ4NDJiNTBiMzQxMGMwOGI4NDJiMzZiMTdlOTNlY2I5OGVi
|
15
|
+
MzMxYmRmZTFlZTJlMTFlM2U4MzY0NmYwYWFiODNlZGI3MWU2MzY=
|
@@ -160,7 +160,7 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
|
|
160
160
|
end
|
161
161
|
end
|
162
162
|
|
163
|
-
@collection ||= @model.reflections[params[:field].
|
163
|
+
@collection ||= @model.reflections[params[:field].to_s].klass.where(params[:fk_id].to_sym => params[:value]).map { |i| [i.to_s, i.id] }
|
164
164
|
render_model_template(:remote)
|
165
165
|
end
|
166
166
|
|
@@ -20,7 +20,7 @@ module MyAdminFieldHelper
|
|
20
20
|
unless block.blank?
|
21
21
|
collection = instance_exec object, &(block)
|
22
22
|
else
|
23
|
-
collection ||= model.reflections[field.
|
23
|
+
collection ||= model.reflections[field.to_s].klass.all.map { |i| [i.to_s, i.id] } unless model.reflections[field.to_s].blank?
|
24
24
|
end
|
25
25
|
collection ||= []
|
26
26
|
collection
|
@@ -44,7 +44,7 @@ module MyAdminFieldHelper
|
|
44
44
|
|
45
45
|
object_type = object.send(field).class.name.underscore unless object.blank?
|
46
46
|
object_type = column.type unless column.blank?
|
47
|
-
object_type = model.reflections[field.
|
47
|
+
object_type = model.reflections[field.to_s].macro if model.reflections.has_key? field.to_s
|
48
48
|
object_type = field_setting(model, field, :type) unless field_setting(model, field, :type).blank?
|
49
49
|
object_type
|
50
50
|
|
@@ -56,7 +56,7 @@ module MyAdminFieldHelper
|
|
56
56
|
|
57
57
|
object_type = object.send(field).class.name.underscore unless object.blank?
|
58
58
|
object_type = column.type unless column.blank?
|
59
|
-
object_type = model.reflections[field.
|
59
|
+
object_type = model.reflections[field.to_s].macro if model.reflections.has_key? field.to_s
|
60
60
|
object_type = field_setting(model, field, :type) unless field_setting(model, field, :type).blank?
|
61
61
|
object_type = field_setting(model, field, :filter_type) unless field_setting(model, field, :filter_type).blank?
|
62
62
|
object_type
|
@@ -1,6 +1,6 @@
|
|
1
|
-
<% has_many_model = model.reflections[field.
|
1
|
+
<% has_many_model = model.reflections[field.to_s].klass %>
|
2
2
|
|
3
|
-
<% limit = model.reflections[field.
|
3
|
+
<% limit = model.reflections[field.to_s].options[:limit] || 0 %>
|
4
4
|
|
5
5
|
<% can_destroy = field_setting(model, field, :can_destroy) %>
|
6
6
|
<% can_add = field_setting(model, field, :can_add) %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% type = "default" %>
|
2
|
-
<% type = model.reflections[field.
|
2
|
+
<% type = model.reflections[field.to_s].macro if model.reflections.has_key? field.to_s %>
|
3
3
|
<% klass = field_setting(model, field, :class) %>
|
4
4
|
|
5
5
|
<%= form.text_field field, :disabled => true, :class => klass %>
|
data/lib/my_admin/version.rb
CHANGED
data/my_admin.gemspec
CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
|
|
15
15
|
s.rubyforge_project = "my_admin"
|
16
16
|
s.required_ruby_version = ">= 1.9.3"
|
17
17
|
|
18
|
-
s.add_dependency "rails", "~> 4"
|
18
|
+
s.add_dependency "rails", "~> 4.2.1"
|
19
19
|
s.add_dependency "breadcrumbs" , "~> 0.1"
|
20
20
|
s.add_dependency "dynamic_form" , "~> 1.1"
|
21
21
|
s.add_dependency "paperclip" , "~> 4.2"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: my_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Marcos Vinicius von Gal dos Santos
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-10-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 4.2.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
26
|
+
version: 4.2.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: breadcrumbs
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|