Download as
Browse Code »

Commit 6ed2fbe7ba301e74fe00754202bab309a0ddfa61

Authored by Daniela Feitosa
1 parent 02b13044
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

create_topics: saving number of access to db 

Also fixed typo

(ActionItem2997)
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @6ed2fbe
... ... @@ -29,9 +29,9 @@ class CmsController < MyProfileController
29 29 end
30 30  
31 31 protect_if :only => :new do |c, user, profile|
32   - article_id = c.params[:parent_id]
33   - (!article_id.blank? && (profile.articles.find(article_id).allow_create?(user) || profile.articles.find(article_id).parent.allow_create?(user))) ||
34   - (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
  32 + article = profile.articles.find_by_id(c.params[:parent_id])
  33 + (!article.nil? && (article.allow_create?(user) || article.parent.allow_create?(user))) ||
  34 + (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
35 35 end
36 36  
37 37 protect_if :only => [:destroy, :publish] do |c, user, profile|
... ...
app/helpers/article_helper.rb
  Diff comments   View file @6ed2fbe
... ... @@ -55,7 +55,7 @@ module ArticleHelper
55 55 content_tag(
56 56 'div',
57 57 check_box(:article, :allows_members_to_create_topics) +
58   - content_tag('label', _('Allow member to create topics'), :for => 'article_allows_members_to_create_topics')
  58 + content_tag('label', _('Allow members to create topics'), :for => 'article_allows_members_to_create_topics')
59 59 ) : '')
60 60 )
61 61 end
... ...