SONAR-3956 Roles service in project is not called in a standard way

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb
index 941583f2ce1de589f0b4d72b2ad12d936ad4f384..517b7ae46fb43df9d480b6f9b838b7c1941976d0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb
@@ -25,36 +25,36 @@ class ProjectRolesController < ApplicationController
   verify :method => :post, :only => [:grant_users, :grant_groups ], :redirect_to => { :action => 'index' }
 
   def index
-    @project=Project.by_key(params[:resource])
+    @project=Project.by_key(params[:id])
     access_denied unless is_admin?(@project)
   end
 
   def edit_users
-    @project=Project.by_key(params[:resource])
+    @project=Project.by_key(params[:id])
     access_denied unless is_admin?(@project)
     @role = params[:role]
   end
 
   def edit_groups
-    @project=Project.by_key(params[:resource])
+    @project=Project.by_key(params[:id])
     access_denied unless is_admin?(@project)
     @role = params[:role]
   end
 
   def grant_users
-    project=Project.by_key(params[:resource])
+    project=Project.by_key(params[:id])
     access_denied unless is_admin?(project)
 
     UserRole.grant_users(params[:users], params[:role], project.id)
-    redirect_to(:action => 'index', :resource => project.id)
+    redirect_to(:action => 'index', :id => project.id)
   end
 
   def grant_groups
-    project=Project.by_key(params[:resource])
+    project=Project.by_key(params[:id])
     access_denied unless is_admin?(project)
 
     GroupRole.grant_groups(params[:groups], params[:role], project.id)
-    redirect_to(:action => 'index', :resource => project.id)
+    redirect_to(:action => 'index', :id => project.id)
   end
 
 end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
index a87e486b779fc4208c0d88063dd3f202814ccdd3..4093ba3a6d1013e075ac654a88be064450f44d1e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
@@ -20,7 +20,7 @@
          # NOTE: we keep "@project.view? || @project.subview?" in the test for backward compatibility with the Views plugin
          if (controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'hasRolePolicy') || @project.view? || @project.subview?)
       %>
-      <li><a href="<%= ApplicationController.root_context -%>/project_roles/index?resource=<%= @project.id -%>"><%= message('roles.page') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/project_roles/index/<%= @project.id -%>"><%= message('roles.page') -%></a></li>
       <% end %>
       <%
          # NOTE: we keep "@project.view? || @project.subview?" in the test for backward compatibility with the Views plugin

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb
index 0528c9dd75daf5bf29f84aded3ecd33c9101b4b4..5fb122b945c9eda86b0aa1989dbb92600a73bbe7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb
@@ -2,12 +2,12 @@
   granted_groups=groups(@role, @project.id)
   ungranted_groups=all_groups - granted_groups
 %>
-<div class="subtitle">&raquo; <a href="<%= url_for :action => 'index', :resource => @project.id -%>">Back</a></div>
+<div class="subtitle">&raquo; <a href="<%= url_for :action => 'index', :id => @project.id -%>">Back</a></div>
 <h1>Role Membership Of <%= h(@project.name) %></h1>
 <br/>
 <div>
   <form action="<%= url_for :action => 'grant_groups' -%>" method="post">
-    <input name="resource" value="<%= @project.id -%>" type="hidden"/>
+    <input name="id" value="<%= @project.id -%>" type="hidden"/>
     <input name="role" value="<%= @role -%>" type="hidden"/>
     <table>
       <tbody>
@@ -37,7 +37,7 @@
 
             <div style="padding: 5px 0">
               <input id="save" value="Save" onclick="SelectBox.select_all('to');submit();return false;" type="submit">
-              <a href="<%= url_for :action => 'index', :resource => @project.id -%>"><%=  message 'cancel' -%></a>
+              <a href="<%= url_for :action => 'index', :id => @project.id -%>"><%=  message 'cancel' -%></a>
             </div>
           </td>
         </tr>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_users.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_users.html.erb
index cd57c893533be02ffe0e720f043792bff7856f74..337c5f491de2637c7fc983b25ed64eeb8d6bb3a2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_users.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_users.html.erb
@@ -1,13 +1,13 @@
 <%
-  granted_users=users(@role, params[:resource])
+  granted_users=users(@role, params[:id])
   ungranted_users=all_users - granted_users
 %>
-<div class="subtitle">&raquo; <a href="<%= url_for :action => 'index', :resource => @project.id -%>">Back</a></div>
+<div class="subtitle">&raquo; <a href="<%= url_for :action => 'index', :id => @project.id -%>">Back</a></div>
 <h1>Role Membership Of <%= h(@project.name) %></h1>
 <br/>
 <div id="main_content">
   <form action="<%= url_for :action => 'grant_users' -%>" method="post">
-    <input name="resource" value="<%= params[:resource] -%>" type="hidden"/>
+    <input name="id" value="<%= params[:id] -%>" type="hidden"/>
     <input name="role" value="<%= @role -%>" type="hidden"/>
     <input name="redirect" value="<%= params[:redirect] -%>" type="hidden"/>
     <table>
@@ -36,7 +36,7 @@
 
             <div style="padding: 5px 0;">
               <input id="save" value="Save" onclick="SelectBox.select_all('to');submit();return false;" type="submit">
-              <a href="<%= url_for :action => 'index', :resource => @project.id -%>"><%= message 'cancel' -%></a>
+              <a href="<%= url_for :action => 'index', :id => @project.id -%>"><%= message 'cancel' -%></a>
             </div>
           </td>
         </tr>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
index 61aea2fcde7055b10dad233f3e9831feecef587b..a8aafe7d97a277aedffb82942c580585ecd7f1d5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
@@ -11,34 +11,34 @@
   <tr class="even" >
     <td valign="top"><b>Administrators</b><br/><span class="small gray">Ability to perform administration functions for a project by accessing its settings.</span></td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= users('admin', params[:resource]).map(&:name).join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'admin'}, :class => 'link-action' %>)
+      <span><%= users('admin', params[:id]).map(&:name).join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_users', :id => @project.id, :role => 'admin'}, :class => 'link-action' %>)
     </td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= groups('admin', params[:resource]).map{|g| group_name(g)}.join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'admin'}, :class => 'link-action' %>)
+      <span><%= groups('admin', params[:id]).map{|g| group_name(g)}.join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_groups', :id => @project.id, :role => 'admin'}, :class => 'link-action' %>)
     </td>
   </tr>
   <tr class="odd">
     <td valign="top"><b>Users</b><br/><span class="small gray">Ability to navigate through every service of a project, except viewing source code and settings.</span></td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= users('user', params[:resource]).map(&:name).join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'user'}, :class => 'link-action' %>)
+      <span><%= users('user', params[:id]).map(&:name).join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_users', :id => @project.id, :role => 'user'}, :class => 'link-action' %>)
     </td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= groups('user', params[:resource]).map{|g| group_name(g)}.join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'user'}, :class => 'link-action' %>)
+      <span><%= groups('user', params[:id]).map{|g| group_name(g)}.join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_groups', :id => @project.id, :role => 'user'}, :class => 'link-action' %>)
     </td>
   </tr>
   <tr class="even" >
     <td valign="top"><b>Code viewers</b><br/><span class="small gray">Ability to view source code of a project.</span></td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= users('codeviewer', params[:resource]).map(&:name).join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_users', :resource => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>)
+      <span><%= users('codeviewer', params[:id]).map(&:name).join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_users', :id => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>)
     </td>
     <td valign="top" style="word-break:break-all;width:35%;">
-      <span><%= groups('codeviewer', params[:resource]).map{|g| group_name(g)}.join(', ') %></span>
-      (<%= link_to "select", {:action => 'edit_groups', :resource => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>)
+      <span><%= groups('codeviewer', params[:id]).map{|g| group_name(g)}.join(', ') %></span>
+      (<%= link_to "select", {:action => 'edit_groups', :id => @project.id, :role => 'codeviewer'}, :class => 'link-action' %>)
     </td>
   </tr>
   </tbody>