rails3: refactoring interface for category selection

Victor Costa
1 parent d4026821
Showing 8 changed files with 34 additions and 36 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/helpers/categories_helper.rb
app/views/shared/_select_categories.html.erb
app/views/shared/_select_subcategories.html.erb
app/views/shared/update_categories.js.erb
test/functional/cms_controller_test.rb
test/functional/profile_editor_controller_test.rb
@@ -231,7 +231,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
+    render :template => 'shared/update_categories', :locals => { :category => @current_category }
   end
   def publish
@@ -60,7 +60,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     end
-    render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
+    render :template => 'shared/update_categories', :locals => { :category => @current_category }
   end
   def header_footer
@@ -50,11 +50,17 @@ module CategoriesHelper
   #FIXME make this test
   def selected_category_link(cat)
-    js_remove = j("jQuery('#selected-category-#{cat.id}').remove();")
+    js_remove = "jQuery('#selected-category-#{cat.id}').remove();"
     content_tag('div', button_to_function_without_text(:remove, _('Remove'), js_remove) +
       link_to_function(cat.full_name(' &rarr; '), js_remove, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link'),
       :class => 'selected-category'
     )
   end
+  def update_categories_link(body, category_id=nil, html_options={})
+    link_to body,
+      { :action => "update_categories", :category_id => category_id, :id => @object },
+      {:id => category_id ? "select-category-#{category_id}-link" : nil, :remote => true, :class => 'select-subcategory-link'}.merge(html_options)
+  end
+
 end
@@ -3,30 +3,25 @@
 <% if !@current_category.nil? %>
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
   <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
-  <%= button_to_remote_without_text(:back, _('Back'),
-      { :update => "select-categories",
-        :url => { :action => 'update_categories', :id => @object },
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :id => 'cancel-category-button') %>
+
+  <%= update_categories_link("", nil, :id => "cancel-category-button", :class => "button icon-back") %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
   %>
-  <%= categories.compact.reverse.map{|i|
-    link_to_remote(i.name,
-      :update => "select-categories",
-      :url => { :action => 'update_categories', :category_id => i.id, :id => @object },
-      :loaded => visual_effect(:highlight, "select-categories"),
-      :class => 'select-current-category-link')}.join(' &rarr; ')
-  %>
-  <%= button_to_function_without_text(:add, _('Add'), nil, :id => 'save-category-button') do |page|
-    page.insert_html :bottom, 'selected-categories', content_tag('div',
-      hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
-      selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
-    page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
-      :locals => {:object_name => object_name, :categories => @toplevel_categories}
-  end if multiple %>
+  <%= categories.compact.reverse.map{|i| update_categories_link(i.name, i.id)}.join %>
+
+  <script>
+    function add_category() {
+      var hidden_field = '<%= j hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) %>';
+      var category_link = '<%= j selected_category_link(categories.first) %>';
+      jQuery('#selected-categories').append('<div id="selected-category-<%= categories.first.id %>">' + hidden_field + category_link + '</div>');
+      var subcategories = '<%= j(render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @toplevel_categories}) %>';
+      jQuery('#select-categories').html(subcategories);
+    }
+  </script>
+
+  <%= button_to_function_without_text(:add, _('Add'), 'add_category()', :id => 'save-category-button') %>
 <% end %>
 <div class="toplevel-categories">
@@ -3,14 +3,6 @@
   <div class="category-helper-label"><%= _('Click to select a category') %></div>
   <% categories.select{|i| @object.accept_category?(i)}.each do |category| %>
-
-    <%= link_to_remote category.name,
-      { :update => "select-categories",
-        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
-        :loaded => j(visual_effect(:highlight, "select-categories"))
-      },
-      :class => 'select-subcategory-link',
-      :id => "select-category-#{category.id}-link"
-    %>
+    <%= update_categories_link(category.name, category.id) %>
   <% end %>
 <% end %>
@@ -0,0 +1,5 @@
+<%
+  content = render :partial => 'shared/select_categories',
+      :locals => {:object_name => 'article', :multiple => true}, :layout => false
+%>
+jQuery('#select-categories').html('<%= j(content) %>');
@@ -682,8 +682,8 @@ class CmsControllerTest &lt; ActionController::TestCase
     top = env.categories.create!(:display_in_menu => true, :name => 'Top-Level category')
     c1  = env.categories.create!(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id)
     c2  = env.categories.create!(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id)
-    get :update_categories, :profile => profile.identifier, :category_id => top.id
-    assert_template 'shared/_select_categories'
+    xhr :get, :update_categories, :profile => profile.identifier, :category_id => top.id
+    assert_template 'shared/update_categories'
     assert_equal top, assigns(:current_category)
     assert_equal [c1, c2], assigns(:categories)
   end
@@ -474,8 +474,8 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     top = env.categories.create!(:display_in_menu => true, :name => 'Top-Level category')
     c1  = env.categories.create!(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id)
     c2  = env.categories.create!(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id)
-    get :update_categories, :profile => profile.identifier, :category_id => top.id
-    assert_template 'shared/_select_categories'
+    xhr :get, :update_categories, :profile => profile.identifier, :category_id => top.id
+    assert_template 'shared/update_categories'
     assert_equal top, assigns(:current_category)
     assert_equal [c1, c2], assigns(:categories)
   end
	@@ -231,7 +231,7 @@ class CmsController < MyProfileController		@@ -231,7 +231,7 @@ class CmsController < MyProfileController
231	@current_category = Category.find(params[:category_id])	231	@current_category = Category.find(params[:category_id])
232	@categories = @current_category.children	232	@categories = @current_category.children
233	end	233	end
234	- render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false	234	+ render :template => 'shared/update_categories', :locals => { :category => @current_category }
235	end	235	end
236		236
237	def publish	237	def publish
	@@ -60,7 +60,7 @@ class ProfileEditorController < MyProfileController		@@ -60,7 +60,7 @@ class ProfileEditorController < MyProfileController
60	@current_category = Category.find(params[:category_id])	60	@current_category = Category.find(params[:category_id])
61	@categories = @current_category.children	61	@categories = @current_category.children
62	end	62	end
63	- render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false	63	+ render :template => 'shared/update_categories', :locals => { :category => @current_category }
64	end	64	end
65		65
66	def header_footer	66	def header_footer
	@@ -3,14 +3,6 @@		@@ -3,14 +3,6 @@
3	<div class="category-helper-label"><%= _('Click to select a category') %></div>	3	<div class="category-helper-label"><%= _('Click to select a category') %></div>
4		4
5	<% categories.select{\|i\| @object.accept_category?(i)}.each do \|category\| %>	5	<% categories.select{\|i\| @object.accept_category?(i)}.each do \|category\| %>
6	-
7	- <%= link_to_remote category.name,
8	- { :update => "select-categories",
9	- :url => { :action => "update_categories", :category_id => category.id, :id => @object},
10	- :loaded => j(visual_effect(:highlight, "select-categories"))
11	- },
12	- :class => 'select-subcategory-link',
13	- :id => "select-category-#{category.id}-link"
14	- %>	6	+ <%= update_categories_link(category.name, category.id) %>
15	<% end %>	7	<% end %>
16	<% end %>	8	<% end %>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<%
	2	+ content = render :partial => 'shared/select_categories',
	3	+ :locals => {:object_name => 'article', :multiple => true}, :layout => false
	4	+%>
	5	+jQuery('#select-categories').html('<%= j(content) %>');