diff options
3 files changed, 9 insertions, 29 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb index 8372ed6347f..85fa88847f6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb @@ -50,10 +50,7 @@ class ManualMeasuresController < ApplicationController load_measures() already_defined_metrics=@measures.map {|m| m.metric} @manual_metrics=Metric.all.select { |m| m.user_managed? && !already_defined_metrics.include?(m)} - - @errors = [] - @errors << 'Metric must be selected.' - render :partial => 'manual_measures/create_form', :status => 400 + render :text => 'Metric must be selected.', :status => 400 else @metric=Metric.by_key(params[:metric]) @@ -68,14 +65,8 @@ class ManualMeasuresController < ApplicationController flash[:notice] = 'Measure successfully created.' render :text => 'ok', :status => 200 else - - load_measures() - already_defined_metrics=@measures.map {|m| m.metric} - @manual_metrics=Metric.all.select { |m| m.user_managed? && !already_defined_metrics.include?(m)} - - @errors = [] - @measure.errors.full_messages.each{|msg| @errors<<msg} - render :partial => 'manual_measures/create_form', :status => 400 + render :text => @measure.errors.full_messages.map{|msg| msg}.join('<br/>'), + :status => 400 end end end @@ -94,9 +85,8 @@ class ManualMeasuresController < ApplicationController flash[:notice] = 'Measure successfully edited.' render :text => 'ok', :status => 200 else - @errors = [] - @measure.errors.full_messages.each{|msg| @errors<<msg} - render :partial => 'manual_measures/edit_form', :status => 400 + render :text => @measure.errors.full_messages.map{|msg| msg}.join('<br/>'), + :status => 400 end end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb index 83093066d73..45e2fc5830a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb @@ -24,13 +24,8 @@ </div> <% else %> <div class="modal-body"> - <% if @errors - @errors.each do |error| - %> - <p class="error"><%= h error -%></p> - <% end - end - %> + <div class="modal-error"></div> + <input type="hidden" name="id" value="<%= @resource.id -%>"/> <div class="modal-field"> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb index a750e7eaca7..bb37846b992 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb @@ -5,13 +5,8 @@ </div> <div class="modal-body"> - <% if @errors - @errors.each do |error| - %> - <p class="error"><%= h error -%></p> - <% end - end - %> + <div class="modal-error"></div> + <input type="hidden" name="id" value="<%= @resource.id -%>"/> <div class="modal-field"> |