[PATCH conductor] BZ800308 removed duplicate cancel button in catalog and pool forms
jtomasek at redhat.com
jtomasek at redhat.com
Fri Mar 9 14:46:28 UTC 2012
From: Jiri Tomasek <jtomasek at redhat.com>
---
src/app/controllers/catalogs_controller.rb | 1 +
src/app/views/catalogs/edit.html.haml | 2 --
src/app/views/pools/_edit.html.haml | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/app/controllers/catalogs_controller.rb b/src/app/controllers/catalogs_controller.rb
index 18fa292..afc0901 100644
--- a/src/app/controllers/catalogs_controller.rb
+++ b/src/app/controllers/catalogs_controller.rb
@@ -71,6 +71,7 @@ class CatalogsController < ApplicationController
end
def update
+ load_pools
@catalog = Catalog.find(params[:id])
require_privilege(Privilege::MODIFY, @catalog)
require_privilege(Privilege::CREATE, Catalog, @catalog.pool)
diff --git a/src/app/views/catalogs/edit.html.haml b/src/app/views/catalogs/edit.html.haml
index 4653e1f..2e0d5ed 100644
--- a/src/app/views/catalogs/edit.html.haml
+++ b/src/app/views/catalogs/edit.html.haml
@@ -3,8 +3,6 @@
%h1{:class => controller.controller_name}= @catalog.name
#obj_actions.button-container
= link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
- .button-group
- = link_to t('catalogs.edit.cancel_editing'), catalogs_path, :class => 'button pill danger', :id => 'cancel_catalog_button'
%section.admin-content-section.user
%header
diff --git a/src/app/views/pools/_edit.html.haml b/src/app/views/pools/_edit.html.haml
index 3e4c302..58c2d99 100644
--- a/src/app/views/pools/_edit.html.haml
+++ b/src/app/views/pools/_edit.html.haml
@@ -3,8 +3,6 @@
#obj_actions.button-container
- if check_privilege(Privilege::CREATE, Pool)
= link_to t('pools.new_pool'), new_pool_url, :class => 'button primary', :id => 'new_pool_button'
- .button-group
- = link_to t('cancel'), pool_path(@pool), :class => 'button pill danger', :id => 'new_user_button'
.corner
%section.content-section.user
--
1.7.7.6
More information about the aeolus-devel
mailing list