aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2013-07-03 15:52:51 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2013-07-03 15:54:13 +0200
commitf4e75e1a2b27c4294b5c75aa4f1776f6234f45f8 (patch)
treea66f737c6b0238edefe2bfe7a64e05359abbaa02
parentabe3ced83543d0f1998bf1acfca4e6b5b705c787 (diff)
downloadsonarqube-f4e75e1a2b27c4294b5c75aa4f1776f6234f45f8.tar.gz
sonarqube-f4e75e1a2b27c4294b5c75aa4f1776f6234f45f8.zip
SONAR-4473 Fix project settings subcategories
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb2
2 files changed, 3 insertions, 3 deletions
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 bf155ec2999..acad3ac1d88 100644
--- 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 b3d1f3831cd..f41d0a16e7f 100644
--- 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>