SONAR-4763 Use modal windows in Manual measures Page

(remove /dev hard code and remove debug code and debug loop)

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 daa7228d049948fe94b15e38b55f8c4aa293efd7..9ee8a1000defea8fb7cd17d84d5427411126018a 100644 (file)
--- 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
@@ -28,15 +28,11 @@ class ManualMeasuresController < ApplicationController
   end
 
   def create_form
-      load_measures()
-      already_defined_metrics=@measures.map {|m| m.metric}
-      @manual_metrics=Metric.all.select { |m| m.user_managed? && !already_defined_metrics.include?(m)}
-      #puts '********************************'+@manual_metrics.to_json
-      @manual_metrics.each do |metric|
-        puts '**' + metric.name
-      end
-      @metric=nil
-      @measure=nil
+    load_measures()
+    already_defined_metrics=@measures.map {|m| m.metric}
+    @manual_metrics=Metric.all.select { |m| m.user_managed? && !already_defined_metrics.include?(m)}
+    @metric=nil
+    @measure=nil
 
     render :partial => 'manual_measures/create_form'
   end
@@ -46,7 +42,6 @@ class ManualMeasuresController < ApplicationController
     @measure=ManualMeasure.find(:first, :conditions => ['resource_id=? and metric_id=?', @resource.id, @metric.id]) || ManualMeasure.new
 
     render :partial => 'manual_measures/edit_form'
-
   end
 
   def create

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 4c882d08a3aad77a3c76aa200b70c45195b67a02..627d2ed4188f79db8c7c6c4eaa41d7685d812939 100644 (file)
--- 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
@@ -15,7 +15,7 @@
         <% if @manual_metrics.empty? %>
           <div class="modal-body">
             <div class="info">
-              <img style="vertical-align: text-bottom" src="/dev/images/information.png">
+              <img style="vertical-align: text-bottom" src="<%= ApplicationController.root_context -%>/images/information.png">
               <%= message('manual_measures.no_more_available_metric') -%>
               <%  if has_role?(:admin)  %>
                 <%= link_to message('manual_measures.to_define_new_manual_metric_il_require'), :controller => 'metrics', :action => 'index' -%>