update component settings links

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index 9b965ee07b72cdf41928c61e5a743b4f94d582be..c856dfa948876fed18dc2ef947f640efa78030aa 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -16,7 +16,11 @@
     <ul class="tabs">
       <% subcategories.each do |subcategory| -%>
         <li>
-          <%= link_to subcategory_name(@category, subcategory), {:controller => @resource ? 'project' : 'settings', :action => @resource ? 'settings' : 'index', :category => @category.key, :subcategory => subcategory.key, :id => (@resource && @resource.id)}, :class => @subcategory==subcategory ? 'selected' : nil -%>
+          <% if @resource %>
+            <a <% if @subcategory==subcategory %>class="selected"<% end -%> href="<%= url_for(:controller => 'project', :action => 'settings', :id => nil) -%>?id=<%= url_encode(@resource.key) -%>&category=<%= url_encode(@category.key) -%>&subcategory=<%= url_encode(subcategory.key) -%>"><%= h subcategory_name(@category, subcategory) -%></a>
+          <% else %>
+            <%= link_to subcategory_name(@category, subcategory), {:controller => 'settings', :action =>'index', :category => @category.key, :subcategory => subcategory.key}, :class => @subcategory==subcategory ? 'selected' : nil -%>
+          <% end %>
         </li>
       <% end -%>
     </ul>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
index 44528177c57e9e99eb4284ff44faa06c89593a32..422c00f9048538f85d295249247a73c997def2ef 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
@@ -16,7 +16,13 @@
           <tbody>
           <% @categories.each do |category| -%>
             <tr id="select_<%= category.key -%>" class="select <%= cycle('even', 'odd', :name => 'category') -%> <%= 'selected' if @category.key==category.key -%>">
-              <td class="category"><%= link_to category_name(category), :category => category.key -%></td>
+              <td class="category">
+                <% if @resource %>
+                  <a href="<%= url_for(:controller => 'project', :action => 'settings') -%>?id=<%= url_encode(@resource.key) -%>&category=<%= url_encode(category.key) -%>"><%= h category_name(category) -%></a>
+                <% else %>
+                  <%= link_to category_name(category), :category => category.key -%>
+                <% end %>
+              </td>
             </tr>
           <% end -%>
           </tbody>