SONAR-4473 Fix project settings subcategories

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb
index bf155ec2999da5d1a5792488def1204ac0719a6d..acad3ac1d881e576acbae40cb4fd95416b416030 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb
@@ -1,5 +1,5 @@
 <div name="settings">
   <div class="yui-g widget" id="widget_plugins">
-    <%= render :partial => 'settings/settings', :locals => {:project=>@project} %>
+    <%= render :partial => 'settings/settings' %>
   </div>
-</div>
\ No newline at end of file
+</div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index b3d1f3831cd56a854c4e7cff7e800a4ce89c29df..f41d0a16e7f142051b4dbdef4ee32017e2ad3098 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -10,7 +10,7 @@
     <ul class="tabs2">
       <% subcategories.each do |subcategory| -%>
         <li>
-          <%= link_to subcategory_name(@category, subcategory), {:action => @resource ? 'settings' : 'index', :category => @category, :subcategory => subcategory}, :class => @subcategory==subcategory ? 'selected' : nil -%>
+          <%= link_to subcategory_name(@category, subcategory), {:controller => @resource ? 'project' : 'settings', :action => @resource ? 'settings' : 'index', :category => @category, :subcategory => subcategory, :id => @resource ? @resource.id : nil}, :class => @subcategory==subcategory ? 'selected' : nil -%>
         </li>
       <% end -%>
     </ul>