From 84fee048d23444771ef349b5d8ab7887582f9aa0 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 21 Apr 2010 12:07:30 -0300 Subject: [PATCH] Check for current user for "unblock" button --- app/views/blocks/disabled_enterprise_message.rhtml | 2 +- app/views/shared/_disabled_enterprise.rhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/blocks/disabled_enterprise_message.rhtml b/app/views/blocks/disabled_enterprise_message.rhtml index 6d92659..208fe0c 100644 --- a/app/views/blocks/disabled_enterprise_message.rhtml +++ b/app/views/blocks/disabled_enterprise_message.rhtml @@ -1,6 +1,6 @@
<%= message %> - <% if profile.blocked? && user.is_admin?(profile.environment) %> + <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
<%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
diff --git a/app/views/shared/_disabled_enterprise.rhtml b/app/views/shared/_disabled_enterprise.rhtml index e246d31..aa6f177 100644 --- a/app/views/shared/_disabled_enterprise.rhtml +++ b/app/views/shared/_disabled_enterprise.rhtml @@ -1,7 +1,7 @@ <% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
<%= environment.message_for_disabled_enterprise %> - <% if profile.blocked? && user.is_admin?(profile.environment) %> + <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
<%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-- libgit2 0.21.2