active_scaffold 3.1.20 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. data/app/assets/javascripts/jquery/active_scaffold.js +4 -1
  2. data/app/assets/javascripts/prototype/active_scaffold.js +4 -1
  3. data/app/assets/stylesheets/{active_scaffold.scss~ → active_scaffold.css.scss} +5 -2
  4. data/app/assets/stylesheets/{active_scaffold_colors.scss → active_scaffold_colors.css.scss} +4 -0
  5. data/app/assets/stylesheets/active_scaffold_extensions.css.erb +2 -0
  6. data/app/assets/stylesheets/active_scaffold_images.css.scss +43 -0
  7. data/lib/active_scaffold/actions/core.rb +1 -0
  8. data/lib/active_scaffold/actions/nested.rb +0 -1
  9. data/lib/active_scaffold/extensions/action_view_rendering.rb +1 -1
  10. data/lib/active_scaffold/helpers/form_column_helpers.rb +1 -0
  11. data/lib/active_scaffold/version.rb +2 -2
  12. data/test/mock_app/.gitignore +2 -0
  13. metadata +86 -164
  14. data/app/assets/javascripts/active_scaffold.js.erb~ +0 -16
  15. data/app/assets/javascripts/jquery/active_scaffold.js~ +0 -1053
  16. data/app/assets/javascripts/jquery/draggable_lists.js~ +0 -27
  17. data/app/assets/javascripts/prototype/active_scaffold.js~ +0 -1037
  18. data/app/assets/stylesheets/active_scaffold.css.erb +0 -11
  19. data/app/assets/stylesheets/active_scaffold.css.erb~ +0 -11
  20. data/app/assets/stylesheets/active_scaffold.css.scss.erb~ +0 -1120
  21. data/app/assets/stylesheets/active_scaffold.css.scss~ +0 -11
  22. data/app/assets/stylesheets/active_scaffold.css~ +0 -11
  23. data/app/assets/stylesheets/active_scaffold_colors.css +0 -244
  24. data/app/assets/stylesheets/active_scaffold_colors.css.scss~ +0 -481
  25. data/app/assets/stylesheets/active_scaffold_default.css.erb +0 -47
  26. data/app/assets/stylesheets/active_scaffold_default.css.erb~ +0 -57
  27. data/app/assets/stylesheets/active_scaffold_default.css.scss~ +0 -1092
  28. data/app/assets/stylesheets/active_scaffold_default.css~ +0 -923
  29. data/app/assets/stylesheets/active_scaffold_layout.css~ +0 -922
  30. data/app/assets/stylesheets/blue-theme.css~ +0 -1150
  31. data/config/locales/es.yml~ +0 -120
  32. data/frontends/default/views/_action_group.html.erb~ +0 -24
  33. data/frontends/default/views/_base_form.html.erb~ +0 -42
  34. data/frontends/default/views/_form.html.erb~ +0 -26
  35. data/frontends/default/views/_form_association.html.erb~ +0 -19
  36. data/frontends/default/views/_form_association_footer.html.erb~ +0 -48
  37. data/frontends/default/views/_horizontal_subform.html.erb~ +0 -32
  38. data/frontends/default/views/_horizontal_subform_header.html.erb~ +0 -11
  39. data/frontends/default/views/_horizontal_subform_record.html.erb~ +0 -38
  40. data/frontends/default/views/_list_actions.html.erb~ +0 -15
  41. data/frontends/default/views/_list_inline_adapter.html.erb~ +0 -10
  42. data/frontends/default/views/_list_messages.html.erb~ +0 -30
  43. data/frontends/default/views/_list_pagination.html.erb~ +0 -11
  44. data/frontends/default/views/_list_pagination_links.html.erb~ +0 -0
  45. data/frontends/default/views/_list_with_header.html.erb~ +0 -36
  46. data/frontends/default/views/_render_field.js.erb~ +0 -23
  47. data/frontends/default/views/_row.html.erb~ +0 -6
  48. data/frontends/default/views/_show.html.erb~ +0 -8
  49. data/frontends/default/views/_update_form.html.erb~ +0 -6
  50. data/frontends/default/views/_vertical_subform.html.erb~ +0 -12
  51. data/frontends/default/views/add_existing.js.erb~ +0 -18
  52. data/frontends/default/views/add_existing_form.html.erb~ +0 -5
  53. data/frontends/default/views/create.html.erb~ +0 -5
  54. data/frontends/default/views/edit_associated.js.erb~ +0 -13
  55. data/frontends/default/views/on_create.js.erb~ +0 -45
  56. data/frontends/default/views/on_update.js.erb~ +0 -31
  57. data/frontends/default/views/render_field.js.erb~ +0 -1
  58. data/frontends/default/views/search.html.erb~ +0 -5
  59. data/frontends/default/views/show.html.erb~ +0 -5
  60. data/frontends/default/views/update.html.erb~ +0 -8
  61. data/frontends/default/views/update_column.js.erb~ +0 -16
  62. data/lib/active_scaffold.rb~ +0 -373
  63. data/lib/active_scaffold/actions/core.rb~ +0 -203
  64. data/lib/active_scaffold/actions/create.rb~ +0 -148
  65. data/lib/active_scaffold/actions/list.rb~ +0 -196
  66. data/lib/active_scaffold/actions/nested.rb~ +0 -247
  67. data/lib/active_scaffold/actions/search.rb~ +0 -49
  68. data/lib/active_scaffold/actions/subform.rb~ +0 -27
  69. data/lib/active_scaffold/actions/update.rb~ +0 -150
  70. data/lib/active_scaffold/attribute_params.rb~ +0 -203
  71. data/lib/active_scaffold/bridges/date_picker/helper.rb~ +0 -180
  72. data/lib/active_scaffold/bridges/record_select/helpers.rb~ +0 -86
  73. data/lib/active_scaffold/bridges/shared/date_bridge.rb~ +0 -209
  74. data/lib/active_scaffold/config/base.rb~ +0 -72
  75. data/lib/active_scaffold/config/list.rb~ +0 -195
  76. data/lib/active_scaffold/config/nested.rb~ +0 -41
  77. data/lib/active_scaffold/config/search.rb~ +0 -74
  78. data/lib/active_scaffold/constraints.rb~ +0 -186
  79. data/lib/active_scaffold/data_structures/action_columns.rb~ +0 -140
  80. data/lib/active_scaffold/data_structures/action_link.rb~ +0 -179
  81. data/lib/active_scaffold/data_structures/nested_info.rb~ +0 -147
  82. data/lib/active_scaffold/extensions/action_controller_rendering.rb~ +0 -22
  83. data/lib/active_scaffold/extensions/action_view_rendering.rb~ +0 -120
  84. data/lib/active_scaffold/extensions/active_association_reflection.rb~ +0 -22
  85. data/lib/active_scaffold/extensions/cache_association.rb~ +0 -12
  86. data/lib/active_scaffold/extensions/reverse_associations.rb~ +0 -64
  87. data/lib/active_scaffold/extensions/routing_mapper.rb~ +0 -48
  88. data/lib/active_scaffold/extensions/unsaved_associated.rb~ +0 -62
  89. data/lib/active_scaffold/finder.rb~ +0 -370
  90. data/lib/active_scaffold/helpers/controller_helpers.rb~ +0 -92
  91. data/lib/active_scaffold/helpers/form_column_helpers.rb~ +0 -320
  92. data/lib/active_scaffold/helpers/id_helpers.rb~ +0 -123
  93. data/lib/active_scaffold/helpers/list_column_helpers.rb~ +0 -370
  94. data/lib/active_scaffold/helpers/search_column_helpers.rb~ +0 -263
  95. data/lib/active_scaffold/helpers/view_helpers.rb~ +0 -350
data/app/assets/javascripts/jquery/active_scaffold.js CHANGED
@@ -749,7 +749,10 @@ var ActiveScaffold = {
749
749
  var params = null;
750
750
 
751
751
  if (send_form) {
752
- params = as_form.serialize();
752
+ var selector;
753
+ if (selector = element.data('update_send_form_selector'))
754
+ params = as_form.find(selector).serialize();
755
+ else params = as_form.serialize();
753
756
  params += '&' + jQuery.param({"source_id": source_id});
754
757
  } else {
755
758
  params = {value: val};
data/app/assets/javascripts/prototype/active_scaffold.js CHANGED
@@ -613,7 +613,10 @@ var ActiveScaffold = {
613
613
  var params = null;
614
614
 
615
615
  if (send_form) {
616
- params = as_form.serialize(true);
616
+ var selector;
617
+ if (selector = element.readAttribute('data-update_send_form_selector'))
618
+ params = Form.serializeElements(as_form.getElementsBySelector(selector), true);
619
+ else params = as_form.serialize(true);
617
620
  } else {
618
621
  params = {value: val};
619
622
  }
data/app/assets/stylesheets/{active_scaffold.scss~ → active_scaffold.css.scss} RENAMED
@@ -5,7 +5,10 @@
5
5
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
6
6
 
7
7
  For details, see the ActiveScaffold web site: http://www.activescaffold.com/
8
- *= require active_scaffold_layout
9
- *= require active_scaffold_default
10
8
  */
9
+
10
+ @import 'active_scaffold_layout';
11
+ @import 'active_scaffold_images';
12
+ @import 'jquery-ui';
13
+ @import 'active_scaffold_extensions';
11
14
  @import 'active_scaffold_colors';
data/app/assets/stylesheets/{active_scaffold_colors.scss → active_scaffold_colors.css.scss} RENAMED
@@ -83,6 +83,10 @@ $subform_color: #999 !default;
83
83
  $subform_header_color: $header_color !default;
84
84
  $subform_footer_color: $subform_color !default;
85
85
 
86
+ .active-scaffold a, .active-scaffold a:visited {
87
+ color: $link_color;
88
+ }
89
+
86
90
  .active-scaffold a.disabled {
87
91
  color: $disabled_color;
88
92
  }
data/app/assets/stylesheets/active_scaffold_extensions.css.erb ADDED
@@ -0,0 +1,2 @@
1
+ <% ActiveScaffold.stylesheets.each {|css| require_asset css} %>
2
+ <% ActiveScaffold::Bridges.all_stylesheets.each {|css| require_asset css} %>
data/app/assets/stylesheets/active_scaffold_images.css.scss ADDED
@@ -0,0 +1,43 @@
1
+ .active-scaffold-header div.actions div.action_group div {
2
+ background-image: image-url('active_scaffold/gears.png'); /* default icon for actions or override with css */
3
+ }
4
+
5
+ .active-scaffold-header div.actions a.show_config_list {
6
+ background-image: image-url('active_scaffold/config.png');
7
+ }
8
+
9
+ .active-scaffold-header div.actions a.new,
10
+ .active-scaffold-header div.actions a.new_existing {
11
+ background-image: image-url('active_scaffold/add.gif');
12
+ }
13
+
14
+ .active-scaffold-header div.actions a.show_search {
15
+ background-image: image-url('active_scaffold/magnifier.png');
16
+ }
17
+
18
+ .active-scaffold th.asc a,
19
+ .active-scaffold th.asc a:hover {
20
+ background-image: image-url('active_scaffold/arrow_up.gif');
21
+ }
22
+
23
+ .active-scaffold th.desc a,
24
+ .active-scaffold th.desc a:hover {
25
+ background-image: image-url('active_scaffold/arrow_down.gif');
26
+ }
27
+
28
+ .active-scaffold th.loading a,
29
+ .active-scaffold th.loading a:hover {
30
+ background-image: image-url('active_scaffold/indicator-small.gif');
31
+ }
32
+
33
+ .active-scaffold a.inline-adapter-close {
34
+ background-image: image-url('active_scaffold/close.gif');
35
+ }
36
+
37
+ .active-scaffold .sub-form .association-record a.destroy {
38
+ background-image: image-url('active_scaffold/cross.png');
39
+ }
40
+
41
+ .as_touch a.inline-adapter-close {
42
+ background-image: image-url('active_scaffold/close_touch.png');
43
+ }
data/lib/active_scaffold/actions/core.rb CHANGED
@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
2
2
  module Core
3
3
  def self.included(base)
4
4
  base.class_eval do
5
+ before_filter :register_constraints_with_action_columns
5
6
  after_filter :clear_flashes
6
7
  end
7
8
  base.helper_method :nested?
data/lib/active_scaffold/actions/nested.rb CHANGED
@@ -5,7 +5,6 @@ module ActiveScaffold::Actions
5
5
  def self.included(base)
6
6
  super
7
7
  base.module_eval do
8
- #before_filter :register_constraints_with_action_columns
9
8
  prepend_before_filter :set_nested
10
9
  before_filter :configure_nested
11
10
  include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.model.reflect_on_all_associations.any? {|a| a.macro == :has_and_belongs_to_many}
data/lib/active_scaffold/extensions/action_view_rendering.rb CHANGED
@@ -87,7 +87,7 @@ module ActionView::Helpers #:nodoc:
87
87
  if ActiveScaffold.js_framework == :prototype
88
88
  javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
89
89
  elsif ActiveScaffold.js_framework == :jquery
90
- javascript_tag("$('##{id}').load('#{url}');")
90
+ javascript_tag("jQuery('##{id}').load('#{url}');")
91
91
  end
92
92
  end
93
93
  end
data/lib/active_scaffold/helpers/form_column_helpers.rb CHANGED
@@ -88,6 +88,7 @@ module ActiveScaffold
88
88
  options[:class] = "#{options[:class]} update_form".strip
89
89
  options['data-update_url'] = url_for(url_params)
90
90
  options['data-update_send_form'] = true if column.send_form_on_update_column
91
+ options['data-update_send_form_selector'] = column.options[:send_form_selector] if column.options[:send_form_selector]
91
92
  end
92
93
  options
93
94
  end
data/lib/active_scaffold/version.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
- MINOR = 1
5
- PATCH = 20
4
+ MINOR = 2
5
+ PATCH = 0
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
data/test/mock_app/.gitignore ADDED
@@ -0,0 +1,2 @@
1
+ tmp/
2
+ log/
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold
3
3
  version: !ruby/object:Gem::Version
4
- hash: 43
4
+ hash: 15
5
5
  prerelease:
6
6
  segments:
7
7
  - 3
8
- - 1
9
- - 20
10
- version: 3.1.20
8
+ - 2
9
+ - 0
10
+ version: 3.2.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - Many, see README
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-02-02 00:00:00 Z
18
+ date: 2012-02-14 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  version_requirements: &id001 !ruby/object:Gem::Requirement
@@ -102,34 +102,19 @@ files:
102
102
  - app/assets/javascripts/jquery/date_picker_bridge.js.erb
103
103
  - app/assets/javascripts/jquery/draggable_lists.js
104
104
  - app/assets/javascripts/jquery/jquery.editinplace.js
105
- - app/assets/javascripts/jquery/active_scaffold.js~
106
105
  - app/assets/javascripts/jquery/tiny_mce_bridge.js
107
- - app/assets/javascripts/jquery/draggable_lists.js~
108
106
  - app/assets/javascripts/prototype/active_scaffold.js
109
107
  - app/assets/javascripts/prototype/dhtml_history.js
110
108
  - app/assets/javascripts/prototype/form_enhancements.js
111
109
  - app/assets/javascripts/prototype/rico_corner.js
112
110
  - app/assets/javascripts/prototype/tiny_mce_bridge.js
113
- - app/assets/javascripts/prototype/active_scaffold.js~
114
- - app/assets/javascripts/active_scaffold.js.erb~
115
111
  - app/assets/stylesheets/active_scaffold-ie.css
116
- - app/assets/stylesheets/active_scaffold.css.erb
117
- - app/assets/stylesheets/blue-theme.css
118
- - app/assets/stylesheets/active_scaffold.css.erb~
119
- - app/assets/stylesheets/active_scaffold.scss~
120
- - app/assets/stylesheets/blue-theme.css~
121
- - app/assets/stylesheets/active_scaffold_default.css~
122
- - app/assets/stylesheets/active_scaffold_default.css.scss~
123
- - app/assets/stylesheets/active_scaffold.css.scss.erb~
124
- - app/assets/stylesheets/active_scaffold_layout.css~
125
- - app/assets/stylesheets/active_scaffold_colors.css.scss~
126
- - app/assets/stylesheets/active_scaffold_colors.css
127
- - app/assets/stylesheets/active_scaffold_default.css.erb
112
+ - app/assets/stylesheets/active_scaffold.css.scss
113
+ - app/assets/stylesheets/active_scaffold_colors.css.scss
114
+ - app/assets/stylesheets/active_scaffold_extensions.css.erb
115
+ - app/assets/stylesheets/active_scaffold_images.css.scss
128
116
  - app/assets/stylesheets/active_scaffold_layout.css
129
- - app/assets/stylesheets/active_scaffold_default.css.erb~
130
- - app/assets/stylesheets/active_scaffold_colors.scss
131
- - app/assets/stylesheets/active_scaffold.css.scss~
132
- - app/assets/stylesheets/active_scaffold.css~
117
+ - app/assets/stylesheets/blue-theme.css
133
118
  - config/locales/de.yml
134
119
  - config/locales/en.yml
135
120
  - config/locales/es.yml
@@ -137,8 +122,9 @@ files:
137
122
  - config/locales/hu.yml
138
123
  - config/locales/ja.yml
139
124
  - config/locales/ru.yml
140
- - config/locales/es.yml~
125
+ - frontends/default/views/_action_group.html.erb
141
126
  - frontends/default/views/_add_existing_form.html.erb
127
+ - frontends/default/views/_base_form.html.erb
142
128
  - frontends/default/views/_create_form.html.erb
143
129
  - frontends/default/views/_create_form_on_list.html.erb
144
130
  - frontends/default/views/_field_search.html.erb
@@ -149,159 +135,69 @@ files:
149
135
  - frontends/default/views/_form_hidden_attribute.html.erb
150
136
  - frontends/default/views/_form_messages.html.erb
151
137
  - frontends/default/views/_horizontal_subform.html.erb
138
+ - frontends/default/views/_horizontal_subform_footer.html.erb
152
139
  - frontends/default/views/_horizontal_subform_header.html.erb
153
140
  - frontends/default/views/_horizontal_subform_record.html.erb
141
+ - frontends/default/views/_human_conditions.html.erb
154
142
  - frontends/default/views/_list.html.erb
155
143
  - frontends/default/views/_list_actions.html.erb
156
144
  - frontends/default/views/_list_calculations.html.erb
157
145
  - frontends/default/views/_list_column_headings.html.erb
158
146
  - frontends/default/views/_list_header.html.erb
159
147
  - frontends/default/views/_list_inline_adapter.html.erb
148
+ - frontends/default/views/_list_messages.html.erb
149
+ - frontends/default/views/_list_pagination.html.erb
160
150
  - frontends/default/views/_list_pagination_links.html.erb
161
151
  - frontends/default/views/_list_record.html.erb
162
- - frontends/default/views/_action_group.html.erb
152
+ - frontends/default/views/_list_record_columns.html.erb
153
+ - frontends/default/views/_list_with_header.html.erb
163
154
  - frontends/default/views/_messages.html.erb
164
- - frontends/default/views/_base_form.html.erb
165
155
  - frontends/default/views/_render_field.js.erb
156
+ - frontends/default/views/_row.html.erb
166
157
  - frontends/default/views/_search.html.erb
158
+ - frontends/default/views/_search_attribute.html.erb
167
159
  - frontends/default/views/_show.html.erb
168
- - frontends/default/views/list.html.erb
169
160
  - frontends/default/views/_show_columns.html.erb
170
161
  - frontends/default/views/_update_actions.html.erb
171
162
  - frontends/default/views/_update_form.html.erb
172
163
  - frontends/default/views/_vertical_subform.html.erb
173
164
  - frontends/default/views/_vertical_subform_record.html.erb
174
- - frontends/default/views/_row.html.erb
175
- - frontends/default/views/delete.html.erb
165
+ - frontends/default/views/action_confirmation.html.erb
166
+ - frontends/default/views/add_existing.js.erb
176
167
  - frontends/default/views/add_existing_form.html.erb
177
168
  - frontends/default/views/create.html.erb
178
- - frontends/default/views/_list_messages.html.erb
179
- - frontends/default/views/_human_conditions.html.erb
180
- - frontends/default/views/field_search.html.erb
181
- - frontends/default/views/add_existing.js.erb
182
- - frontends/default/views/search.html.erb
169
+ - frontends/default/views/delete.html.erb
183
170
  - frontends/default/views/destroy.js.erb
184
- - frontends/default/views/update.html.erb
185
- - frontends/default/views/_list_with_header.html.erb
186
- - frontends/default/views/_list_pagination.html.erb
187
- - frontends/default/views/show.html.erb
188
- - frontends/default/views/form_messages.js.erb
189
- - frontends/default/views/_list_record_columns.html.erb
190
171
  - frontends/default/views/edit_associated.js.erb
191
- - frontends/default/views/_search_attribute.html.erb
192
- - frontends/default/views/action_confirmation.html.erb
193
- - frontends/default/views/_horizontal_subform_footer.html.erb
172
+ - frontends/default/views/field_search.html.erb
173
+ - frontends/default/views/form_messages.js.erb
174
+ - frontends/default/views/list.html.erb
194
175
  - frontends/default/views/on_action_update.js.erb
195
176
  - frontends/default/views/on_create.js.erb
196
177
  - frontends/default/views/on_mark_all.js.erb
197
178
  - frontends/default/views/on_update.js.erb
198
179
  - frontends/default/views/refresh_list.js.erb
199
180
  - frontends/default/views/render_field.js.erb
200
- - frontends/default/views/_base_form.html.erb~
181
+ - frontends/default/views/search.html.erb
182
+ - frontends/default/views/show.html.erb
183
+ - frontends/default/views/update.html.erb
201
184
  - frontends/default/views/update_column.js.erb
202
185
  - frontends/default/views/update_row.js.erb
203
- - frontends/default/views/_form.html.erb~
204
- - frontends/default/views/_row.html.erb~
205
- - frontends/default/views/render_field.js.erb~
206
- - frontends/default/views/update_column.js.erb~
207
- - frontends/default/views/_form_association_footer.html.erb~
208
- - frontends/default/views/edit_associated.js.erb~
209
- - frontends/default/views/_form_association.html.erb~
210
- - frontends/default/views/_vertical_subform.html.erb~
211
- - frontends/default/views/_horizontal_subform.html.erb~
212
- - frontends/default/views/_show.html.erb~
213
- - frontends/default/views/_horizontal_subform_header.html.erb~
214
- - frontends/default/views/_list_pagination.html.erb~
215
- - frontends/default/views/_list_actions.html.erb~
216
- - frontends/default/views/_list_pagination_links.html.erb~
217
- - frontends/default/views/_list_messages.html.erb~
218
- - frontends/default/views/_render_field.js.erb~
219
- - frontends/default/views/_action_group.html.erb~
220
- - frontends/default/views/on_update.js.erb~
221
- - frontends/default/views/on_create.js.erb~
222
- - frontends/default/views/_horizontal_subform_record.html.erb~
223
- - frontends/default/views/_list_with_header.html.erb~
224
- - frontends/default/views/_update_form.html.erb~
225
- - frontends/default/views/add_existing.js.erb~
226
- - frontends/default/views/_list_inline_adapter.html.erb~
227
- - frontends/default/views/add_existing_form.html.erb~
228
- - frontends/default/views/update.html.erb~
229
- - frontends/default/views/search.html.erb~
230
- - frontends/default/views/create.html.erb~
231
- - frontends/default/views/show.html.erb~
232
186
  - lib/active_scaffold.rb
233
- - lib/active_scaffold_env.rb
187
+ - lib/active_scaffold/actions/common_search.rb
234
188
  - lib/active_scaffold/actions/core.rb
235
189
  - lib/active_scaffold/actions/create.rb
236
190
  - lib/active_scaffold/actions/delete.rb
237
191
  - lib/active_scaffold/actions/field_search.rb
238
192
  - lib/active_scaffold/actions/list.rb
239
- - lib/active_scaffold/actions/common_search.rb
240
- - lib/active_scaffold/actions/show.rb
193
+ - lib/active_scaffold/actions/mark.rb
241
194
  - lib/active_scaffold/actions/nested.rb
242
195
  - lib/active_scaffold/actions/search.rb
196
+ - lib/active_scaffold/actions/show.rb
243
197
  - lib/active_scaffold/actions/subform.rb
244
198
  - lib/active_scaffold/actions/update.rb
245
- - lib/active_scaffold/actions/mark.rb
246
- - lib/active_scaffold/actions/core.rb~
247
- - lib/active_scaffold/actions/nested.rb~
248
- - lib/active_scaffold/actions/update.rb~
249
- - lib/active_scaffold/actions/create.rb~
250
- - lib/active_scaffold/actions/list.rb~
251
- - lib/active_scaffold/actions/subform.rb~
252
- - lib/active_scaffold/actions/search.rb~
253
- - lib/active_scaffold/attribute_params.rb
254
- - lib/active_scaffold/config/base.rb
255
- - lib/active_scaffold/config/core.rb
256
- - lib/active_scaffold/config/create.rb
257
- - lib/active_scaffold/config/delete.rb
258
- - lib/active_scaffold/config/field_search.rb
259
- - lib/active_scaffold/config/form.rb
260
- - lib/active_scaffold/config/list.rb
261
- - lib/active_scaffold/config/nested.rb
262
- - lib/active_scaffold/config/search.rb
263
- - lib/active_scaffold/config/show.rb
264
- - lib/active_scaffold/config/subform.rb
265
- - lib/active_scaffold/config/update.rb
266
- - lib/active_scaffold/config/mark.rb
267
- - lib/active_scaffold/config/search.rb~
268
- - lib/active_scaffold/config/nested.rb~
269
- - lib/active_scaffold/config/base.rb~
270
- - lib/active_scaffold/config/list.rb~
271
- - lib/active_scaffold/configurable.rb
272
- - lib/active_scaffold/constraints.rb
273
- - lib/active_scaffold/data_structures/action_columns.rb
274
- - lib/active_scaffold/data_structures/action_link.rb
275
- - lib/active_scaffold/data_structures/action_links.rb
276
- - lib/active_scaffold/data_structures/actions.rb
277
- - lib/active_scaffold/data_structures/column.rb
278
- - lib/active_scaffold/data_structures/columns.rb
279
- - lib/active_scaffold/data_structures/error_message.rb
280
- - lib/active_scaffold/data_structures/set.rb
281
- - lib/active_scaffold/data_structures/sorting.rb
282
- - lib/active_scaffold/data_structures/nested_info.rb
283
- - lib/active_scaffold/data_structures/bridge.rb
284
- - lib/active_scaffold/data_structures/nested_info.rb~
285
- - lib/active_scaffold/data_structures/action_columns.rb~
286
- - lib/active_scaffold/data_structures/action_link.rb~
287
- - lib/active_scaffold/finder.rb
288
- - lib/active_scaffold/helpers/association_helpers.rb
289
- - lib/active_scaffold/helpers/controller_helpers.rb
290
- - lib/active_scaffold/helpers/form_column_helpers.rb
291
- - lib/active_scaffold/helpers/view_helpers.rb
292
- - lib/active_scaffold/helpers/id_helpers.rb
293
- - lib/active_scaffold/helpers/list_column_helpers.rb
294
- - lib/active_scaffold/helpers/pagination_helpers.rb
295
- - lib/active_scaffold/helpers/search_column_helpers.rb
296
- - lib/active_scaffold/helpers/show_column_helpers.rb
297
- - lib/active_scaffold/helpers/human_condition_helpers.rb
298
- - lib/active_scaffold/helpers/controller_helpers.rb~
299
- - lib/active_scaffold/helpers/view_helpers.rb~
300
- - lib/active_scaffold/helpers/form_column_helpers.rb~
301
- - lib/active_scaffold/helpers/id_helpers.rb~
302
- - lib/active_scaffold/helpers/list_column_helpers.rb~
303
- - lib/active_scaffold/helpers/search_column_helpers.rb~
304
199
  - lib/active_scaffold/active_record_permissions.rb
200
+ - lib/active_scaffold/attribute_params.rb
305
201
  - lib/active_scaffold/bridges.rb
306
202
  - lib/active_scaffold/bridges/ancestry.rb
307
203
  - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
@@ -319,7 +215,6 @@ files:
319
215
  - lib/active_scaffold/bridges/date_picker.rb
320
216
  - lib/active_scaffold/bridges/date_picker/ext.rb
321
217
  - lib/active_scaffold/bridges/date_picker/helper.rb
322
- - lib/active_scaffold/bridges/date_picker/helper.rb~
323
218
  - lib/active_scaffold/bridges/dragonfly.rb
324
219
  - lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb
325
220
  - lib/active_scaffold/bridges/dragonfly/dragonfly_bridge_helpers.rb
@@ -340,15 +235,38 @@ files:
340
235
  - lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb
341
236
  - lib/active_scaffold/bridges/record_select.rb
342
237
  - lib/active_scaffold/bridges/record_select/helpers.rb
343
- - lib/active_scaffold/bridges/record_select/helpers.rb~
344
238
  - lib/active_scaffold/bridges/semantic_attributes.rb
345
239
  - lib/active_scaffold/bridges/semantic_attributes/column.rb
346
240
  - lib/active_scaffold/bridges/shared/date_bridge.rb
347
- - lib/active_scaffold/bridges/shared/date_bridge.rb~
348
241
  - lib/active_scaffold/bridges/tiny_mce.rb
349
242
  - lib/active_scaffold/bridges/tiny_mce/helpers.rb
350
- - lib/active_scaffold/version.rb
351
- - lib/active_scaffold/marked_model.rb
243
+ - lib/active_scaffold/config/base.rb
244
+ - lib/active_scaffold/config/core.rb
245
+ - lib/active_scaffold/config/create.rb
246
+ - lib/active_scaffold/config/delete.rb
247
+ - lib/active_scaffold/config/field_search.rb
248
+ - lib/active_scaffold/config/form.rb
249
+ - lib/active_scaffold/config/list.rb
250
+ - lib/active_scaffold/config/mark.rb
251
+ - lib/active_scaffold/config/nested.rb
252
+ - lib/active_scaffold/config/search.rb
253
+ - lib/active_scaffold/config/show.rb
254
+ - lib/active_scaffold/config/subform.rb
255
+ - lib/active_scaffold/config/update.rb
256
+ - lib/active_scaffold/configurable.rb
257
+ - lib/active_scaffold/constraints.rb
258
+ - lib/active_scaffold/data_structures/action_columns.rb
259
+ - lib/active_scaffold/data_structures/action_link.rb
260
+ - lib/active_scaffold/data_structures/action_links.rb
261
+ - lib/active_scaffold/data_structures/actions.rb
262
+ - lib/active_scaffold/data_structures/bridge.rb
263
+ - lib/active_scaffold/data_structures/column.rb
264
+ - lib/active_scaffold/data_structures/columns.rb
265
+ - lib/active_scaffold/data_structures/error_message.rb
266
+ - lib/active_scaffold/data_structures/nested_info.rb
267
+ - lib/active_scaffold/data_structures/set.rb
268
+ - lib/active_scaffold/data_structures/sorting.rb
269
+ - lib/active_scaffold/engine.rb
352
270
  - lib/active_scaffold/extensions/action_controller_rendering.rb
353
271
  - lib/active_scaffold/extensions/action_view_rendering.rb
354
272
  - lib/active_scaffold/extensions/active_association_reflection.rb
@@ -365,26 +283,28 @@ files:
365
283
  - lib/active_scaffold/extensions/unsaved_associated.rb
366
284
  - lib/active_scaffold/extensions/unsaved_record.rb
367
285
  - lib/active_scaffold/extensions/usa_state.rb
368
- - lib/active_scaffold/extensions/routing_mapper.rb~
369
- - lib/active_scaffold/extensions/action_controller_rendering.rb~
370
- - lib/active_scaffold/extensions/action_view_rendering.rb~
371
- - lib/active_scaffold/extensions/cache_association.rb~
372
- - lib/active_scaffold/extensions/reverse_associations.rb~
373
- - lib/active_scaffold/extensions/unsaved_associated.rb~
374
- - lib/active_scaffold/extensions/active_association_reflection.rb~
286
+ - lib/active_scaffold/finder.rb
287
+ - lib/active_scaffold/helpers/association_helpers.rb
288
+ - lib/active_scaffold/helpers/controller_helpers.rb
289
+ - lib/active_scaffold/helpers/form_column_helpers.rb
290
+ - lib/active_scaffold/helpers/human_condition_helpers.rb
291
+ - lib/active_scaffold/helpers/id_helpers.rb
292
+ - lib/active_scaffold/helpers/list_column_helpers.rb
293
+ - lib/active_scaffold/helpers/pagination_helpers.rb
294
+ - lib/active_scaffold/helpers/search_column_helpers.rb
295
+ - lib/active_scaffold/helpers/show_column_helpers.rb
296
+ - lib/active_scaffold/helpers/view_helpers.rb
297
+ - lib/active_scaffold/marked_model.rb
375
298
  - lib/active_scaffold/paginator.rb
376
299
  - lib/active_scaffold/responds_to_parent.rb
377
- - lib/active_scaffold/engine.rb
378
- - lib/active_scaffold/attribute_params.rb~
379
- - lib/active_scaffold/finder.rb~
380
- - lib/active_scaffold/constraints.rb~
300
+ - lib/active_scaffold/version.rb
301
+ - lib/active_scaffold_env.rb
381
302
  - lib/generators/active_scaffold/USAGE
382
303
  - lib/generators/active_scaffold/active_scaffold_generator.rb
383
304
  - lib/generators/active_scaffold_controller/USAGE
384
305
  - lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb
385
306
  - lib/generators/active_scaffold_controller/templates/controller.rb
386
307
  - lib/generators/active_scaffold_controller/templates/helper.rb
387
- - lib/active_scaffold.rb~
388
308
  - public/blank.html
389
309
  - shoulda_macros/macros.rb
390
310
  - vendor/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
@@ -406,24 +326,24 @@ files:
406
326
  - MIT-LICENSE
407
327
  - CHANGELOG
408
328
  - README
409
- - test/bridges/bridge_test.rb
410
329
  - test/bridges/active_scaffold_dependent_protect_test.rb
330
+ - test/bridges/bridge_test.rb
411
331
  - test/bridges/company.rb
412
332
  - test/bridges/paperclip_test.rb
413
333
  - test/bridges/tiny_mce_test.rb
414
334
  - test/bridges/unobtrusive_date_picker_test.rb
415
335
  - test/bridges/validation_reflection_test.rb
416
336
  - test/config/base_test.rb
417
- - test/config/create_test.rb
418
- - test/config/list_test.rb
419
- - test/config/show_test.rb
420
- - test/config/update_test.rb
421
337
  - test/config/core_test.rb
338
+ - test/config/create_test.rb
422
339
  - test/config/delete_test.rb
423
340
  - test/config/field_search_test.rb
341
+ - test/config/list_test.rb
424
342
  - test/config/nested_test.rb
425
343
  - test/config/search_test.rb
344
+ - test/config/show_test.rb
426
345
  - test/config/subform_test.rb
346
+ - test/config/update_test.rb
427
347
  - test/const_mocker.rb
428
348
  - test/data_structures/action_columns_test.rb
429
349
  - test/data_structures/action_link_test.rb
@@ -448,6 +368,7 @@ files:
448
368
  - test/misc/constraints_test.rb
449
369
  - test/misc/finder_test.rb
450
370
  - test/misc/lang_test.rb
371
+ - test/mock_app/.gitignore
451
372
  - test/mock_app/app/controllers/application_controller.rb
452
373
  - test/mock_app/app/helpers/application_helper.rb
453
374
  - test/mock_app/config/boot.rb
@@ -519,24 +440,24 @@ signing_key:
519
440
  specification_version: 3
520
441
  summary: Rails 3.1 Version of activescaffold supporting prototype and jquery
521
442
  test_files:
522
- - test/bridges/bridge_test.rb
523
443
  - test/bridges/active_scaffold_dependent_protect_test.rb
444
+ - test/bridges/bridge_test.rb
524
445
  - test/bridges/company.rb
525
446
  - test/bridges/paperclip_test.rb
526
447
  - test/bridges/tiny_mce_test.rb
527
448
  - test/bridges/unobtrusive_date_picker_test.rb
528
449
  - test/bridges/validation_reflection_test.rb
529
450
  - test/config/base_test.rb
530
- - test/config/create_test.rb
531
- - test/config/list_test.rb
532
- - test/config/show_test.rb
533
- - test/config/update_test.rb
534
451
  - test/config/core_test.rb
452
+ - test/config/create_test.rb
535
453
  - test/config/delete_test.rb
536
454
  - test/config/field_search_test.rb
455
+ - test/config/list_test.rb
537
456
  - test/config/nested_test.rb
538
457
  - test/config/search_test.rb
458
+ - test/config/show_test.rb
539
459
  - test/config/subform_test.rb
460
+ - test/config/update_test.rb
540
461
  - test/const_mocker.rb
541
462
  - test/data_structures/action_columns_test.rb
542
463
  - test/data_structures/action_link_test.rb
@@ -561,6 +482,7 @@ test_files:
561
482
  - test/misc/constraints_test.rb
562
483
  - test/misc/finder_test.rb
563
484
  - test/misc/lang_test.rb
485
+ - test/mock_app/.gitignore
564
486
  - test/mock_app/app/controllers/application_controller.rb
565
487
  - test/mock_app/app/helpers/application_helper.rb
566
488
  - test/mock_app/config/boot.rb