[PATCH conductor] BZ 800273 Cancel button on "New component Outline" page should launch the "Clouds" Page

jzigmund at redhat.com jzigmund at redhat.com
Mon Mar 19 16:56:56 UTC 2012


From: Jozef Zigmund <jzigmund at redhat.com>

Bugfix solved 2 issues. Cancel buttons on "New component outline" page and on "New Resource Zone" page.

https://bugzilla.redhat.com/show_bug.cgi?id=800273
---
 src/app/views/images/new.html.haml  |    4 ++--
 src/app/views/pools/_form.html.haml |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/views/images/new.html.haml b/src/app/views/images/new.html.haml
index b14fe46..76f236c 100644
--- a/src/app/views/images/new.html.haml
+++ b/src/app/views/images/new.html.haml
@@ -35,7 +35,7 @@
               = check_box_tag :edit, 1, true
 
           %fieldset.align-center
-            = link_to t(:cancel), pool_family_path(@environment), :class => "button danger"
+            = link_to t(:cancel), pool_families_path, :class => "button danger"
             = submit_tag t(:continue), :id => "file_button", :class => "button primary"
 
       %section#image-url-form
@@ -53,7 +53,7 @@
               = check_box_tag :edit, 1, true
 
           %fieldset.align-center
-            = link_to t(:cancel), pool_family_path(@environment), :class => "button danger"
+            = link_to t(:cancel), pool_families_path, :class => "button danger"
             = submit_tag t(:continue), :id => "url_button", :class => "button primary"
 
 :javascript
diff --git a/src/app/views/pools/_form.html.haml b/src/app/views/pools/_form.html.haml
index a167e37..ccd8360 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -28,7 +28,10 @@
 
   %fieldset.options
     = form.submit t("save"), :class => 'button', :id => 'save_button'
-    = link_to t('cancel'), pools_path, :class => 'button danger'
+    - if @pool.pool_family
+      = link_to t('cancel'), pool_families_path, :class => 'button danger'
+    - else
+      = link_to t('cancel'), pools_path, :class => 'button danger'
 
 :javascript
   $(document).ready(function(){
-- 
1.7.7.6




More information about the aeolus-devel mailing list