Download as
Browse Code »

Commit 66eb5163047b9da097b46e807406f73a2c31712c

Authored by Simiao Carvalho
Committed by Tallys Martins
1 parent 92476194
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

New topics now accepts reply by default 

Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 2 changed files with 4 additions and 6 deletions   Show diff stats
app/helpers/article_helper.rb
  Diff comments   View file @66eb516
... ... @@ -23,13 +23,11 @@ module ArticleHelper
23 23 ) :
24 24 '') +
25 25  
26   - (article.parent && article.parent.forum? && controller.action_name == 'new' ?
27   - hidden_field_tag('article[accept_comments]', 1) :
28 26 content_tag(
29 27 'div',
30 28 check_box(:article, :accept_comments) +
31 29 content_tag('label', (article.parent && article.parent.forum? ? _('This topic is opened for replies') : _('I want to receive comments about this article')), :for => 'article_accept_comments')
32   - )) +
  30 + ) +
33 31  
34 32 content_tag(
35 33 'div',
... ...
test/functional/cms_controller_test.rb
  Diff comments   View file @66eb516
... ... @@ -1601,11 +1601,11 @@ class CmsControllerTest &lt; ActionController::TestCase
1601 1601 assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[display_posts_in_current_language]', :checked => 'checked' }
1602 1602 end
1603 1603  
1604   - should 'not display accept comments option when creating forum post' do
  1604 + should 'display accept comments option when creating forum post' do
1605 1605 profile.articles << f = Forum.new(:name => 'Forum for test')
1606 1606 get :new, :profile => profile.identifier, :type => 'TinyMceArticle', :parent_id => f.id
1607   - assert :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'hidden'}
1608   - assert_no_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'checkbox'}
  1607 + assert_no_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'hidden'}
  1608 + assert_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'checkbox'}
1609 1609 end
1610 1610  
1611 1611 should 'display accept comments option when creating an article that is not a forum post' do
... ...