diff options
| author | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-06-18 11:58:22 +0200 |
|---|---|---|
| committer | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-06-18 11:58:22 +0200 |
| commit | 10c04b05d30152eab21a2f4a8c89a5edc499c7e4 (patch) | |
| tree | a7ce04e995a2ef97ccce36e15ad8f7b8d4d4250a | |
| parent | 85a15c926730478358885d61c489170829c1a070 (diff) | |
| download | sonarqube-10c04b05d30152eab21a2f4a8c89a5edc499c7e4.tar.gz sonarqube-10c04b05d30152eab21a2f4a8c89a5edc499c7e4.zip | |
SONAR-4398 Fixed filter update issue when logged in as standard user
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb | 9 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb | 10 |
2 files changed, 13 insertions, 6 deletions
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 0d4887ec009..2aea260bac5 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,11 +135,16 @@ class MeasuresController < ApplicationController require_parameters :id @filter = MeasureFilter.find(params[:id]) - access_denied unless has_role?(:admin) + access_denied unless @filter.owner?(current_user) || 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 has_role?(:admin) + @filter.user = User.find_by_login(params[:owner]) + end + 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 0f146e17353..7465c6f8ec0 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,10 +16,12 @@ <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> + <% if is_admin? %> + <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> + <% end %> <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 -%>/> |