dynamic_fieldsets 0.1.8 → 0.1.9
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.
- data/CHANGELOG +4 -0
- data/VERSION +1 -1
- data/app/controllers/dynamic_fieldsets/fields_controller.rb +1 -1
- data/app/controllers/dynamic_fieldsets/fieldset_associators_controller.rb +1 -1
- data/app/controllers/dynamic_fieldsets/fieldset_children_controller.rb +2 -2
- data/app/controllers/dynamic_fieldsets/fieldsets_controller.rb +10 -10
- data/app/models/dynamic_fieldsets/field_default.rb +2 -2
- data/app/models/dynamic_fieldsets/fieldset_associator.rb +1 -1
- data/dynamic_fieldsets.gemspec +2 -2
- data/lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb +5 -5
- metadata +3 -3
data/CHANGELOG
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.9
|
@@ -60,7 +60,7 @@ module DynamicFieldsets
|
|
60
60
|
|
61
61
|
if @field.save
|
62
62
|
if !parent_id.empty?
|
63
|
-
parent = DynamicFieldsets::Fieldset.
|
63
|
+
parent = DynamicFieldsets::Fieldset.find(parent_id)
|
64
64
|
DynamicFieldsets::FieldsetChild.create( :fieldset => parent, :child => @field )
|
65
65
|
#relation = @fieldset.fieldset_children.build( :fieldset => parent )
|
66
66
|
#relation.child = @field
|
@@ -14,7 +14,7 @@ module DynamicFieldsets
|
|
14
14
|
|
15
15
|
# show one fieldset associator
|
16
16
|
def show
|
17
|
-
@fieldset_associator = DynamicFieldsets::FieldsetAssociator.
|
17
|
+
@fieldset_associator = DynamicFieldsets::FieldsetAssociator.find(params[:id])
|
18
18
|
respond_to do |format|
|
19
19
|
format.html
|
20
20
|
end
|
@@ -10,8 +10,8 @@ module DynamicFieldsets
|
|
10
10
|
|
11
11
|
# Show a record and all children
|
12
12
|
def show
|
13
|
-
@fieldset_child = DynamicFieldsets::FieldsetChild.
|
14
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
13
|
+
@fieldset_child = DynamicFieldsets::FieldsetChild.find params[:id]
|
14
|
+
@fieldset = DynamicFieldsets::Fieldset.find @fieldset_child.fieldset_id
|
15
15
|
|
16
16
|
respond_to do |format|
|
17
17
|
format.html
|
@@ -23,7 +23,7 @@ module DynamicFieldsets
|
|
23
23
|
|
24
24
|
# Show single fieldset
|
25
25
|
def show
|
26
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
26
|
+
@fieldset = DynamicFieldsets::Fieldset.find(params[:id])
|
27
27
|
|
28
28
|
respond_to do |format|
|
29
29
|
format.html
|
@@ -41,7 +41,7 @@ module DynamicFieldsets
|
|
41
41
|
|
42
42
|
# Edit existing record
|
43
43
|
def edit
|
44
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
44
|
+
@fieldset = DynamicFieldsets::Fieldset.find(params[:id])
|
45
45
|
|
46
46
|
respond_to do |format|
|
47
47
|
format.html
|
@@ -50,7 +50,7 @@ module DynamicFieldsets
|
|
50
50
|
|
51
51
|
# Show a record and all children
|
52
52
|
def children
|
53
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
53
|
+
@fieldset = DynamicFieldsets::Fieldset.find params[:id]
|
54
54
|
|
55
55
|
respond_to do |format|
|
56
56
|
format.html
|
@@ -59,8 +59,8 @@ module DynamicFieldsets
|
|
59
59
|
|
60
60
|
# associates a field or fieldset with the given fieldset by creating a fieldset child
|
61
61
|
def associate_child
|
62
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
63
|
-
@field = DynamicFieldsets::Field.
|
62
|
+
@fieldset = DynamicFieldsets::Fieldset.find(params[:id])
|
63
|
+
@field = DynamicFieldsets::Field.find(params[:field])
|
64
64
|
|
65
65
|
@fieldset_child = DynamicFieldsets::FieldsetChild.where(:child_id => @field.id, :child_type => @field.class.name, :fieldset_id => @fieldset.id).first
|
66
66
|
if(@fieldset_child.nil?)
|
@@ -112,10 +112,10 @@ module DynamicFieldsets
|
|
112
112
|
if parent_identifier.eql? @order.first[0] # This is the first number:
|
113
113
|
then parent_id = parent_identifier # the root fieldset id.
|
114
114
|
# Otherwise, we need to retrieve the parent fieldset_id from the FieldsetChild's child_id.
|
115
|
-
else parent_id = DynamicFieldsets::FieldsetChild.
|
115
|
+
else parent_id = DynamicFieldsets::FieldsetChild.find(parent_identifier).child_id
|
116
116
|
end
|
117
117
|
children.each_with_index do |fieldset_child_id,index|
|
118
|
-
fieldset_child = DynamicFieldsets::FieldsetChild.
|
118
|
+
fieldset_child = DynamicFieldsets::FieldsetChild.find fieldset_child_id
|
119
119
|
fieldset_child.fieldset_id = parent_id
|
120
120
|
fieldset_child.order_num = index+1
|
121
121
|
fieldset_child.save
|
@@ -135,7 +135,7 @@ module DynamicFieldsets
|
|
135
135
|
respond_to do |format|
|
136
136
|
if @fieldset.save
|
137
137
|
if !parent_id.empty?
|
138
|
-
parent = DynamicFieldsets::Fieldset.
|
138
|
+
parent = DynamicFieldsets::Fieldset.find(parent_id)
|
139
139
|
DynamicFieldsets::FieldsetChild.create( :fieldset => parent, :child => @fieldset )
|
140
140
|
#relation = @fieldset.fieldset_children.build( :fieldset => parent )
|
141
141
|
#relation.child = @fieldset
|
@@ -150,7 +150,7 @@ module DynamicFieldsets
|
|
150
150
|
|
151
151
|
# Update existing record
|
152
152
|
def update
|
153
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
153
|
+
@fieldset = DynamicFieldsets::Fieldset.find(params[:id])
|
154
154
|
|
155
155
|
respond_to do |format|
|
156
156
|
if @fieldset.update_attributes(params[:dynamic_fieldsets_fieldset])
|
@@ -163,7 +163,7 @@ module DynamicFieldsets
|
|
163
163
|
|
164
164
|
# Destroy existing record
|
165
165
|
def destroy
|
166
|
-
@fieldset = DynamicFieldsets::Fieldset.
|
166
|
+
@fieldset = DynamicFieldsets::Fieldset.find(params[:id])
|
167
167
|
@fieldset.destroy
|
168
168
|
|
169
169
|
respond_to do |format|
|
@@ -22,7 +22,7 @@ module DynamicFieldsets
|
|
22
22
|
# http://www.youtube.com/watch?v=BeP6CpUnfc0
|
23
23
|
def convert_option_name_to_id
|
24
24
|
if field.uses_field_options?
|
25
|
-
option = FieldOption.where(:name => self.value, :
|
25
|
+
option = FieldOption.where(:name => self.value, :field_id => self.field.id).first
|
26
26
|
self.value = option.id unless option.nil?
|
27
27
|
end
|
28
28
|
end
|
@@ -30,7 +30,7 @@ module DynamicFieldsets
|
|
30
30
|
# @return [String] Either the value or the name of the field option reference by the value
|
31
31
|
def pretty_value
|
32
32
|
if !self.field.nil? && field.uses_field_options?
|
33
|
-
option = FieldOption.
|
33
|
+
option = FieldOption.find(self.value)
|
34
34
|
if !option.nil?
|
35
35
|
return option.name
|
36
36
|
end
|
@@ -30,7 +30,7 @@ module DynamicFieldsets
|
|
30
30
|
# @params [Hash] args A hash of arguments for the scope
|
31
31
|
# @returns [Array] An array of fieldset associators that match the arguments
|
32
32
|
def self.find_by_fieldset_model_parameters(args)
|
33
|
-
fieldset = Fieldset.
|
33
|
+
fieldset = Fieldset.where(:nkey => args[:fieldset_nkey].to_s).first
|
34
34
|
throw "Fieldset not found in FieldsetAssociator.find_by_fieldset_model_parameters" if fieldset.nil?
|
35
35
|
|
36
36
|
where(
|
data/dynamic_fieldsets.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "dynamic_fieldsets"
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.9"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Jeremiah Hemphill", "Ethan Pemble", "John Carter"]
|
12
|
-
s.date = "2012-04-
|
12
|
+
s.date = "2012-04-06"
|
13
13
|
s.description = "Dynamic fieldsets for rails controllers"
|
14
14
|
s.email = "jeremiah@cloudspace.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -199,7 +199,7 @@ module DynamicFieldsets
|
|
199
199
|
:fieldset_model_name => fsa_values[:fieldset_model_name]
|
200
200
|
)
|
201
201
|
else
|
202
|
-
fsa = DynamicFieldsets::FieldsetAssociator.
|
202
|
+
fsa = DynamicFieldsets::FieldsetAssociator.find(key_id)
|
203
203
|
end
|
204
204
|
|
205
205
|
fsa.update_fieldset_records_with_form_information(fsa_values)
|
@@ -269,14 +269,14 @@ module DynamicFieldsets
|
|
269
269
|
fsa = DynamicFieldsets::FieldsetAssociator.find_by_fieldset_model_parameters(
|
270
270
|
:fieldset_model_id => self.id,
|
271
271
|
:fieldset_model_type => self.class.name,
|
272
|
-
:fieldset_model_name => sym,
|
273
|
-
:
|
272
|
+
:fieldset_model_name => sym.to_s,
|
273
|
+
:fieldset_nkey => self.dynamic_fieldsets[sym][:fieldset].to_s).first
|
274
274
|
if fsa.nil?
|
275
275
|
fsa = DynamicFieldsets::FieldsetAssociator.new(
|
276
276
|
:fieldset_model_id => self.id,
|
277
277
|
:fieldset_model_type => self.class.name,
|
278
278
|
:fieldset_model_name => sym.to_s,
|
279
|
-
:
|
279
|
+
:fieldset_id => DynamicFieldsets::Fieldset.where(:nkey => self.dynamic_fieldsets[sym][:fieldset].to_s).first.id)
|
280
280
|
end
|
281
281
|
return fsa
|
282
282
|
else
|
@@ -290,7 +290,7 @@ module DynamicFieldsets
|
|
290
290
|
# @param [Fieldset] The fieldset object for the named fieldset
|
291
291
|
def fieldset(sym)
|
292
292
|
if match_fieldset_associator?(sym)
|
293
|
-
return DynamicFieldsets::Fieldset.
|
293
|
+
return DynamicFieldsets::Fieldset.where(:nkey => self.dynamic_fieldsets[sym][:fieldset]).first
|
294
294
|
else
|
295
295
|
return nil
|
296
296
|
end
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: dynamic_fieldsets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.1.
|
5
|
+
version: 0.1.9
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Jeremiah Hemphill
|
@@ -12,7 +12,7 @@ autorequire:
|
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
14
|
|
15
|
-
date: 2012-04-
|
15
|
+
date: 2012-04-06 00:00:00 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: rails
|
@@ -431,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
431
431
|
requirements:
|
432
432
|
- - ">="
|
433
433
|
- !ruby/object:Gem::Version
|
434
|
-
hash:
|
434
|
+
hash: 4570078976153453742
|
435
435
|
segments:
|
436
436
|
- 0
|
437
437
|
version: "0"
|