[PATCH conductor] catalog entries checkbox in header to enable select all listed catalog entries, catalog entries new_from_image i18n fix

jtomasek at redhat.com jtomasek at redhat.com
Mon Dec 19 09:21:39 UTC 2011


From: Jiri Tomasek <jtomasek at redhat.com>

---
 src/app/controllers/catalogs_controller.rb         |    2 +-
 .../views/deployables/_new_from_image.html.haml    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/controllers/catalogs_controller.rb b/src/app/controllers/catalogs_controller.rb
index 1f92d3b..2dfdb00 100644
--- a/src/app/controllers/catalogs_controller.rb
+++ b/src/app/controllers/catalogs_controller.rb
@@ -41,7 +41,7 @@ class CatalogsController < ApplicationController
     require_privilege(Privilege::VIEW, @catalog)
     save_breadcrumb(catalogs_path(@catalog), @catalog.name)
     @header = [
-      { :name => '', :sortable => false },
+      { :name => 'checkbox', :class => 'checkbox', :sortable => false },
       { :name => t("catalog_entries.index.name"), :sort_attr => :name },
       { :name => t('catalog_entries.index.deployable_xml'), :sortable => false }
     ]
diff --git a/src/app/views/deployables/_new_from_image.html.haml b/src/app/views/deployables/_new_from_image.html.haml
index 0c8edd6..9e00e75 100644
--- a/src/app/views/deployables/_new_from_image.html.haml
+++ b/src/app/views/deployables/_new_from_image.html.haml
@@ -19,7 +19,7 @@
             = select_tag :hardware_profile, options_from_collection_for_select(@hw_profiles, :id, :name, params[:hardware_profile])
             .clear
           %div
-            = form.label :catalog_id, t('catalog_entries.form.catalog')
+            = form.label :catalog_id, t('deployables.form.catalog')
             %span.text_instead_input= @selected_catalogs.empty? ? t('deployables.form.none') : @selected_catalogs.count > 1 ? t('deployables.form.multiple') : @selected_catalogs.first.name
             %span.catalog_link
               &nbsp
@@ -34,5 +34,5 @@
             .clear
       .centered
         %fieldset.align-center
-          = link_to t('catalog_entries.form.cancel'), catalogs_path, :class => 'button danger'
-          = submit_tag "#{t'catalog_entries.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button'
+          = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
+          = submit_tag "#{t'deployables.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button'
-- 
1.7.7.3




More information about the aeolus-devel mailing list