SONAR-2396 Disallow selection of 'new_' metrics for alerts

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb
index a96fe2aa5cf29419519e513c53ec4d89d7c3cdb1..a3e6dcbc2f8685a24b4abe5d820963f9d4a5e5af 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb
@@ -15,7 +15,8 @@
     <option value="" <%= 'selected' if @alert.metric.nil? %>>Select a metric</option>
   <% Metric.domains.each do |domain| %>
   <optgroup label="<%= h domain -%>">
-    <% Metric.by_domain(domain).select{|m| m.alertable? }.each do |metric| %>
+    <%# 'new_' metrics excluded due to SONAR-2396 %>
+    <% Metric.by_domain(domain).select{ |m| m.alertable? && !m.name.start_with?("new_") }.each do |metric| %>
       <option value="<%= metric.id -%>" <%= 'selected' if @alert.metric_id==metric.id -%>><%= metric.short_name %></option>
     <% end %>
   </optgroup>