diff options
| author | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2013-02-15 17:19:28 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2013-02-15 17:19:28 +0100 |
| commit | 72bf960a39ec08483e3bf5ab35ea38ab54ee5308 (patch) | |
| tree | fedfea2915235507b1ba6a67dfc03f10506019d3 /sonar-server | |
| parent | d87469cdc242cf20b0bd9ac73325ac1d01f9b317 (diff) | |
| download | sonarqube-72bf960a39ec08483e3bf5ab35ea38ab54ee5308.tar.gz sonarqube-72bf960a39ec08483e3bf5ab35ea38ab54ee5308.zip | |
SONAR-4037 Fix bug on measures filter edit
=> If a pending updated Measures filter is "saved" without having first
"Closed" the "Change Columns" (or "Change Treemap") section most,
last column changes are lost
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb index 924bc84a141..0389218f98b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb @@ -3,21 +3,20 @@ <%= render :partial => 'measures/sidebar' -%> </div> - <% if @filter && @filter.display %> + <% + if @filter && @filter.display + edit_mode = (params[:edit]=='true') + %> <div class="page-split-right"> <div id="content"> <div class="line-block marginbottom10"> + <% unless edit_mode %> <ul class="operations"> - <% - if @filter.display - edit_mode = (params[:edit]=='true') - unless edit_mode - %> + <% if @filter.display %> <li> <a id="change-display" href="<%= url_for @filter.criteria.merge({:action => 'search', :edit => true, :id => @filter.id}) -%>"><%= message("measure_filter.#{@filter.display.key}.change") -%></a> </li> - <% end %> <li> <%= message 'measure_filter.display_as' -%>: <% MeasureFilterDisplay.keys.each do |display_key| %> @@ -42,6 +41,8 @@ <% end %> <% end %> </ul> + <% end %> + <div class="page_title" id="filter-title"> <% if @filter.id && @filter.name.present? %> <p> |