From 85a15c926730478358885d61c489170829c1a070 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 18 Jun 2013 11:50:01 +0200 Subject: [PATCH] SONAR-4391 Fix some display issues and fix issue on sort --- .../app/controllers/issues_controller.rb | 1 + .../app/views/issues/_action_links.html.erb | 32 +++++++++---------- .../src/main/webapp/stylesheets/style.css | 4 ++- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb index 2ecf08ad93a..55ed4e34a82 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb @@ -36,6 +36,7 @@ class IssuesController < ApplicationController @filter = Internal.issues.createFilterFromMap(criteria_params) end + @criteria_params = criteria_params @issue_query = Internal.issues.toQuery(criteria_params) @issues_result = Internal.issues.execute(@issue_query) end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_action_links.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_action_links.html.erb index a3cf7eaecac..127732b939a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_action_links.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_action_links.html.erb @@ -1,17 +1,17 @@ +<% if logged_in? && !@criteria_params.empty? %> \ No newline at end of file + <% if @filter.id %> +
  • <%= message('copy') -%>
  • + <% end %> + <% if !defined?(@unchanged) && @filter.id && @filter.user == current_user.login %> +
  • + <%= link_to message('save'), params.merge({:action => 'save', :id => @filter.id}), :class => 'link-action', :id => 'save', :method => :post -%> +
  • + <% end %> + <% unless @filter.id %> +
  • + <%= message('save_as') -%> +
  • + <% end %> + +<% end %> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index 656e14bfaef..a0a2cfa0a2a 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -623,7 +623,9 @@ ul.operations { list-style-type: none; margin: 0; background-color: #EFEFEF; - border: 1px solid #cdcdcd; + border-left: 1px solid #cdcdcd; + border-bottom: 1px solid #cdcdcd; + border-top: 1px solid #cdcdcd; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -- 2.39.5