Do not display API key if API is disabled.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3224 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/my/_sidebar.rhtml b/app/views/my/_sidebar.rhtml
index 1f511bdd27d3b0fbb81679e60b6baa21ad4e9450..ee3c8abdc561d70d8e07ddcb1f0e87fc25031f7c 100644 (file)
--- a/app/views/my/_sidebar.rhtml
+++ b/app/views/my/_sidebar.rhtml
@@ -15,6 +15,7 @@
 (<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
 </p>
 
+<% if Setting.rest_api_enabled? %>
 <h4><%= l(:label_api_access_key) %></h4>
 <p>
 <% if @user.api_token %>
@@ -24,3 +25,4 @@
 <% end %>
 (<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
 </p>
+<% end %>

diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 55760f8d18efba93054286ca8fbe141253e3208f..a3136f4cd84afc1c914be92e9984f637538a9e67 100644 (file)
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -52,7 +52,7 @@
 <% end %>
 </div>
 
-<% if @user.api_token %>
+<% if Setting.rest_api_enabled? && @user.api_token %>
 <h3><%=l(:label_api_access_key) %></h3>
 <div class="box">
   <p>