Download as
Browse Code »

Commit dedae62f47b60867e72fda5aae1ad497636c1478

Authored by Daniela Feitosa
1 parent 54b441e2
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Added options for target on model to avoid repetition 

(ActionItem2795)
Showing 3 changed files with 16 additions and 5 deletions   Show diff stats
app/models/link_list_block.rb
  Diff comments   View file @dedae62
... ... @@ -33,6 +33,12 @@ class LinkListBlock < Block
33 33 ['chat', N_('Chat')]
34 34 ]
35 35  
  36 + TARGET_OPTIONS = [
  37 + [N_('Same page'), '_self'],
  38 + [N_('New tab'), '_blank'],
  39 + [N_('New window'), '_new'],
  40 + ]
  41 +
36 42 settings_items :links, Array, :default => []
37 43  
38 44 before_save do |block|
... ...
app/views/box_organizer/_link_list_block.rhtml
  Diff comments   View file @dedae62
... ... @@ -9,9 +9,9 @@
9 9 </td>
10 10 <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
11 11 <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
12   - <td>
13   - <%= select_tag('block[links][][target]', options_for_select([[_('Same page'), '_self'], [_('New tab'), '_blank'], [_('New window'), '_new']], link[:target].blank? ? '_self' : link[:target])) %>
14   - </td>
  12 + <td>
  13 + <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
  14 + </td>
15 15 </tr>
16 16 <% end %>
17 17 </table>
... ... @@ -21,8 +21,9 @@
21 21 page.insert_html :bottom, 'links', content_tag('tr',
22 22 content_tag('td', icon_selector('ok')) +
23 23 content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
24   - content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'cel-address')) +
25   - content_tag('td', select_tag('block[links][][target]',options_for_select([['Mesma pagina', '_self'], ['Nova aba', '_blank'], ['Nova Janela', '_new']], '_self')))
  24 + content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
  25 + content_tag('td', select_tag('block[links][][target]',
  26 +options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
26 27 ) +
27 28 javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
28 29 end %>
... ...
test/unit/link_list_block_test.rb
  Diff comments   View file @dedae62
... ... @@ -83,4 +83,8 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
83 83 assert_equal 'always', block.display
84 84 end
85 85  
  86 + should 'have options for links target' do
  87 + assert_equivalent LinkListBlock::TARGET_OPTIONS.map {|t|t[1]}, ['_self', '_blank', '_new']
  88 + end
  89 +
86 90 end
... ...