From: Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com>
Date: Tue, 18 Jun 2013 08:01:41 +0000 (+0200)
Subject: SONAR-4398 Added support for measure filter ownership changes by admin
X-Git-Tag: 3.7~463
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=547d2b90da8be114a7c0c88dd5a1fde78af85cf5;p=sonarqube.git

SONAR-4398 Added support for measure filter ownership changes by admin
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
index 4b3d1c05005..0d4887ec009 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
@@ -135,10 +135,11 @@ class MeasuresController < ApplicationController
     require_parameters :id
 
     @filter = MeasureFilter.find(params[:id])
-    access_denied unless @filter.owner?(current_user)
+    access_denied unless has_role?(:admin)
     @filter.name=params[:name]
     @filter.description=params[:description]
     @filter.shared=(params[:shared]=='true')
+    @filter.user = User.find_by_login(params[:owner])
     if @filter.save
       render :text => @filter.id.to_s, :status => 200
     else
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb
index ddce1fa28bc..0f146e17353 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb
@@ -16,6 +16,10 @@
         <label for="description"><%= h message('description') -%></label>
         <input id="description" name="description" type="text" size="50" maxlength="4000" value="<%= h @filter.description -%>"/>
       </div>
+      <div class="modal-field">
+        <label for="owner"><%= h message('owner') -%></label>
+        <%= user_select_tag('owner', :html_id => 'select-filter-owner', :selected_user => @filter.user) -%>
+      </div>
       <div class="modal-field">
         <label for="shared"><%= h message('measure_filter.shared_with_all_users') -%></label>
         <input id="shared" name="shared" type="checkbox" value="true" <%= 'checked' if @filter.shared -%>/>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
index 1de3960a5f7..3a3aa646d17 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
@@ -116,7 +116,7 @@
               </td>
               <td class="thin nowrap right">
                 <a id="copy-<%= filter.name.parameterize -%>" href="<%= ApplicationController.root_context -%>/measures/copy_form/<%= filter.id -%>" class="link-action open-modal"><%= message('copy') -%></a>
-                <% if filter.system? && has_role?(:admin) %>
+                <% if has_role?(:admin) %>
                   &nbsp;
                   <a id="edit_system_<%= filter.name.parameterize -%>" href="<%= ApplicationController.root_context -%>/measures/edit_form/<%= filter.id -%>" class="link-action open-modal"><%= message('edit') -%></a>
                   &nbsp;