Show title in select options

(ActionItem1656)

Show title in select options
(ActionItem1656)
Keilla Menezes · Daniela Feitosa
1 parent eb7e3c1f
Showing 5 changed files with 31 additions and 3 deletions Show diff stats
app/helpers/forms_helper.rb
app/views/box_organizer/_article_block.rhtml
public/stylesheets/application.css
test/functional/environment_design_controller_test.rb
test/unit/forms_helper_test.rb
@@ -111,6 +111,18 @@ module FormsHelper
     ))
   end
+  def options_for_select_with_title(container, selected = nil)
+    container = container.to_a if Hash === container
+
+    options_for_select = container.inject([]) do |options, element|
+      text, value = option_text_and_value(element)
+      selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
+      options << %(<option title="#{html_escape(text.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
+    end
+
+    options_for_select.join("\n")
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
-
+<div class='article-block-edition'>
 <% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
   <p id='no_portal_community'>
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <% else %>
   <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select('block', 'article_id', articles.map {|item| [ item.path, item.id]}) %>
+  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]})) %>
 <% end %>
+</div>
@@ -3944,6 +3944,15 @@ h1#agenda-title {
   margin: 5px 0px 5px 160px;
 }
+.controller-profile_design .article-block-edition select,
+.controller-profile_design .article-block-edition option {
+  width: 300px;
+}
+
+.controller-profile_design .article-block-edition option {
+  overflow-x: hidden;
+}
+
 /* ==> public/stylesheets/controller_profile_editor.css <== */
 .controller-profile_editor .categorie_box .button {
@@ -70,7 +70,7 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
     article.expects(:path).returns('some_path')
     article.expects(:id).returns(1)
     get :edit, :id => l.id
-    assert_tag :tag => 'select', :attributes => { :id => 'block_article_id' }
+    assert_tag :tag => 'select', :attributes => { :id => 'block[article_id]' }
   end
   should 'be able to edit ArticleBlock without portal community' do
@@ -4,6 +4,7 @@ class FormsHelperTest &lt; Test::Unit::TestCase
   include FormsHelper
   include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormOptionsHelper
   should 'wrapper required fields in <span class=required-field>' do
     content = required('<input type=text name=test>')
@@ -20,6 +21,11 @@ class FormsHelperTest &lt; Test::Unit::TestCase
     assert_tag_in_string content, :tag => 'label', :content => 'highlighted', :attributes => {:class => 'pseudoformlabel'}
   end
+  should 'show title for option in select' do
+    content = options_for_select_with_title({'option_value' => 'option_title'})
+    assert_tag_in_string content, :tag => 'option', :attributes => {:title => 'option_value'}
+  end
+
   protected
   def _(text)
	@@ -111,6 +111,18 @@ module FormsHelper		@@ -111,6 +111,18 @@ module FormsHelper
111	))	111	))
112	end	112	end
113		113
		114	+ def options_for_select_with_title(container, selected = nil)
		115	+ container = container.to_a if Hash === container
		116	+
		117	+ options_for_select = container.inject([]) do \|options, element\|
		118	+ text, value = option_text_and_value(element)
		119	+ selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
		120	+ options << %(<option title="#{html_escape(text.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
		121	+ end
		122	+
		123	+ options_for_select.join("\n")
		124	+ end
		125	+
114	protected	126	protected
115	def self.next_id_number	127	def self.next_id_number
116	if defined? @@id_num	128	if defined? @@id_num
	@@ -3944,6 +3944,15 @@ h1#agenda-title {		@@ -3944,6 +3944,15 @@ h1#agenda-title {
3944	margin: 5px 0px 5px 160px;	3944	margin: 5px 0px 5px 160px;
3945	}	3945	}
3946		3946
		3947	+.controller-profile_design .article-block-edition select,
		3948	+.controller-profile_design .article-block-edition option {
		3949	+ width: 300px;
		3950	+}
		3951	+
		3952	+.controller-profile_design .article-block-edition option {
		3953	+ overflow-x: hidden;
		3954	+}
		3955	+
3947	/* ==> public/stylesheets/controller_profile_editor.css <== */	3956	/* ==> public/stylesheets/controller_profile_editor.css <== */
3948		3957
3949	.controller-profile_editor .categorie_box .button {	3958	.controller-profile_editor .categorie_box .button {
	@@ -70,7 +70,7 @@ class EnvironmentDesignControllerTest < Test::Unit::TestCase		@@ -70,7 +70,7 @@ class EnvironmentDesignControllerTest < Test::Unit::TestCase
70	article.expects(:path).returns('some_path')	70	article.expects(:path).returns('some_path')
71	article.expects(:id).returns(1)	71	article.expects(:id).returns(1)
72	get :edit, :id => l.id	72	get :edit, :id => l.id
73	- assert_tag :tag => 'select', :attributes => { :id => 'block_article_id' }	73	+ assert_tag :tag => 'select', :attributes => { :id => 'block[article_id]' }
74	end	74	end
75		75
76	should 'be able to edit ArticleBlock without portal community' do	76	should 'be able to edit ArticleBlock without portal community' do