Download as
Browse Code »

Commit fbe9c8769b84012dc09f69e5976275c054d564bf

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent cf4d226c
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

Showing selected article in editing ArticleBlock 

(ActionItem1957)
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/views/box_organizer/_article_block.rhtml
  Diff comments   View file @fbe9c87
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
5 </p> 5 </p>
6 <% else %> 6 <% else %>
7 <% articles = @block.available_articles.select {|article| !article.folder? } %> 7 <% articles = @block.available_articles.select {|article| !article.folder? } %>
8 - <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]})) %> 8 + <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
9 <% end %> 9 <% end %>
10 </div> 10 </div>
test/functional/profile_design_controller_test.rb
  Diff comments   View file @fbe9c87
@@ -401,4 +401,11 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase @@ -401,4 +401,11 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
401 assert_equal [], @controller.available_blocks - ENTERPRISE_BLOCKS_WITH_PRODUCTS_ENABLE 401 assert_equal [], @controller.available_blocks - ENTERPRISE_BLOCKS_WITH_PRODUCTS_ENABLE
402 end 402 end
403 403
  404 + should 'editing article block displays right selected article' do
  405 + selected_article = fast_create(Article, :profile_id => profile.id)
  406 + ArticleBlock.any_instance.stubs(:article).returns(selected_article)
  407 + get :edit, :profile => 'designtestuser', :id => @b1.id
  408 + assert_tag :tag => 'option', :attributes => {:value => selected_article.id, :selected => 'selected'}
  409 + end
  410 +
404 end 411 end