From 128129ef469a5eb017afa0293077dbb64efe8942 Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 30 Jul 2013 17:15:41 +0200
Subject: [PATCH] SONAR-4431 Missing "Cancel" link on Manual Rules, Manual
 Metrics and Action Plans

---
 .../src/main/webapp/WEB-INF/app/views/action_plans/_new.html.erb | 1 +
 .../main/webapp/WEB-INF/app/views/manual_rules/index.html.erb    | 1 +
 .../src/main/webapp/WEB-INF/app/views/metrics/index.html.erb     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_new.html.erb
index eb01fe998c2..b886c246f68 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_new.html.erb
@@ -32,6 +32,7 @@
     <tr>
       <td class="left" valign="top">
         <input type="submit" value="<%= @action_plan && @action_plan.key() ? message('edit') : message('create') -%>"/>
+        <%= link_to message('cancel'), { :controller => 'action_plans', :action => 'index', :id => @resource.id}, { :class => 'action' } %>
       </td>
     </tr>
     </tbody>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
index 6251a0a828a..bc31e663a34 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
@@ -58,6 +58,7 @@
             <tr>
               <td class="left" valign="top">
                 <input type="submit" value="<%= @rule.id.nil? ? message('create') : message('edit') -%>"/>
+                <%= link_to 'Cancel', { :controller => 'manual_rules', :action => 'index'}, { :class => 'action' } %><br/>
               </td>
             </tr>
           </table>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index f07a86b892a..a597deef6ba 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -94,6 +94,7 @@
         <tr>
           <td class="left" valign="top">
             <%= submit_tag @metric.id.nil? ? message('create') : message('edit') %>
+            <%= link_to message('cancel'), { :controller => 'metrics', :action => 'index', :id => nil}, { :class => 'action' } %>
           </td>
         </tr>
       </tbody>
-- 
2.39.5