Download as
Browse Code »

Commit 6e8cbd35d5e84df4d1f55344de734bbf5aa03888

Authored by Leandro Santos
2 parents 8e8f1e4d 44762c66
Exists in send_email_to_admins and in 5 other branches add_member_task_reject_details, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes

Merge branch 'fix_tags_block' into 'master' 

Ensure that tags_helper is loaded

Fix bug when edit a profile that has a tag block added.

See merge request !861
Showing 2 changed files with 6 additions and 0 deletions   Show diff stats
app/views/blocks/tags.html.erb
  Diff comments   View file @6e8cbd3
  1 +<% extend TagsHelper %>
1 <%= block_title(block.title, block.subtitle) %> 2 <%= block_title(block.title, block.subtitle) %>
2 3
3 <% 4 <%
test/functional/profile_design_controller_test.rb
  Diff comments   View file @6e8cbd3
@@ -716,4 +716,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase @@ -716,4 +716,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
716 assert_equal assigns(:current_category), c1 716 assert_equal assigns(:current_category), c1
717 end 717 end
718 718
  719 + should 'not fail when a profile has a tag block' do
  720 + a = create(Article, :name => 'my article', :profile_id => holder.id, :tag_list => 'tag')
  721 + @box1.blocks << TagsBlock.new
  722 + get :index, :profile => 'designtestuser'
  723 + end
719 end 724 end