Download as
Browse Code »

Commit 7a0aa76eabad2e77a99f46d884dddff92579d94a

Authored by Antonio Terceiro
2 parents 7dfe84e3 84fee048
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 'stable'

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/blocks/disabled_enterprise_message.rhtml
  Diff comments   View file @7a0aa76
1 <div id='enterprise-disabled'> 1 <div id='enterprise-disabled'>
2 <%= message %> 2 <%= message %>
3 - <% if profile.blocked? && user.is_admin?(profile.environment) %> 3 + <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
4 <div class='unlock-button'> 4 <div class='unlock-button'>
5 <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %> 5 <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
6 </div> 6 </div>
app/views/shared/_disabled_enterprise.rhtml
  Diff comments   View file @7a0aa76
1 <% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %> 1 <% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
2 <div id='profile-disabled'> 2 <div id='profile-disabled'>
3 <%= environment.message_for_disabled_enterprise %> 3 <%= environment.message_for_disabled_enterprise %>
4 - <% if profile.blocked? && user.is_admin?(profile.environment) %> 4 + <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
5 <div class='unlock-button'> 5 <div class='unlock-button'>
6 <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %> 6 <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
7 </div> 7 </div>