From 6d1f8d642f2e07f59808a35d9e1a9916ba3b1806 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 13 Dec 2012 10:40:10 +0100
Subject: [PATCH] SONAR-3825 exit the edit mode when saving a filter

---
 .../src/main/resources/org/sonar/l10n/core.properties           | 2 +-
 .../webapp/WEB-INF/app/views/measures/_display_list.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index ccdde9a28bd..296540d7726 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -205,7 +205,6 @@ paging_previous=Previous
 project_name=Project name
 remove_column=Remove this column
 results_not_display_due_to_security=Due to security settings, some results are not being displayed.
-save_and_close=Save & Close
 save_and_preview=Save & Preview
 select_a_metric=Select a metric
 set_as_default=Set as default
@@ -387,6 +386,7 @@ session.flash_notice.logged_out=You have been logged out.
 # MEASURE FILTERS
 #
 #------------------------------------------------------------------------------
+measure_filter.close_and_save=Close & Save
 measure_filter.delete_column=Delete column
 measure_filter.no_filters=No filters
 measure_filter.display_as=Display as
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
index 4eaa345ebdd..b8bc8aa654f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
@@ -139,7 +139,7 @@
       <td class="right">
         <a href="#" class="button" id="exit-edit"><%= message 'close' -%></a>
         <% if filter.owner?(current_user) %>
-          <a id="save-columns" href="<%= url_for params.merge({:action => 'save_form', :id => filter.id}) -%>" class="button open-modal"><%= message('save_and_close') -%></a>
+          <a id="save-columns" href="<%= url_for filter.criteria.merge({:edit => nil, :action => 'save_form', :id => filter.id}) -%>" class="button open-modal"><%= message('measure_filter.close_and_save') -%></a>
         <% end %>
       </td>
     </tr>
-- 
2.39.5