Download as
Browse Code »

Commit 2b336e038fc5673d89d948814077b67501e2eab0

Authored by Antonio Terceiro
2 parents a7f0469c 2b2a906c
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

Merge branch 'fix_block_environment' into 'master' 

Fix block environment

When the owner of the block is Environment it breaks the edition of the block because of the show to followers new option.

See merge request !434
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @2b336e0
@@ -224,7 +224,7 @@ class Block < ActiveRecord::Base @@ -224,7 +224,7 @@ class Block < ActiveRecord::Base
224 'all' => _('All users'), 224 'all' => _('All users'),
225 'logged' => _('Logged'), 225 'logged' => _('Logged'),
226 'not_logged' => _('Not logged'), 226 'not_logged' => _('Not logged'),
227 - 'followers' => owner.organization? ? _('Members') : _('Friends') 227 + 'followers' => owner.class != Environment && owner.organization? ? _('Members') : _('Friends')
228 } 228 }
229 end 229 end
230 230