From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/controllers/catalog_entries_controller.rb | 7 ++-----
src/app/views/catalog_entries/_form.html.haml | 5 +++--
src/app/views/catalog_entries/_from_url.html.haml | 3 ++-
src/app/views/catalog_entries/_upload.html.haml | 3 ++-
src/config/locales/en.yml | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/controllers/catalog_entries_controller.rb
b/src/app/controllers/catalog_entries_controller.rb
index c17070b..65df174 100644
--- a/src/app/controllers/catalog_entries_controller.rb
+++ b/src/app/controllers/catalog_entries_controller.rb
@@ -32,7 +32,6 @@ class CatalogEntriesController < ApplicationController
@catalog = Catalog.find(params[:catalog_id])
@catalog_entry = params[:catalog_entry].nil? ? CatalogEntry.new() :
CatalogEntry.new(params[:catalog_entry])
require_privilege(Privilege::CREATE, CatalogEntry, @catalog)
- load_catalogs
@form_option= params.has_key?(:from_url) ? 'from_url' : 'upload'
respond_to do |format|
format.html
@@ -52,9 +51,10 @@ class CatalogEntriesController < ApplicationController
return
end
- @catalog = Catalog.find(params[:catalog_entry][:catalog_id])
+ @catalog = Catalog.find(params[:catalog_id])
require_privilege(Privilege::CREATE, CatalogEntry, @catalog)
@catalog_entry = CatalogEntry.new(params[:catalog_entry])
+ @catalog_entry.catalog = @catalog
@catalog_entry.owner = current_user
if params.has_key? :url
@@ -75,7 +75,6 @@ class CatalogEntriesController < ApplicationController
end
else
@catalog = Catalog.find(params[:catalog_id])
- load_catalogs
params.delete(:edit_xml) if params[:edit_xml]
flash[:warning]= t('catalog_entries.flash.warning.not_valid') if
@catalog_entry.errors.has_key?(:xml)
@form_option = params[:catalog_entry].has_key?(:xml) ? 'upload' :
'from_url'
@@ -87,7 +86,6 @@ class CatalogEntriesController < ApplicationController
@catalog_entry = CatalogEntry.find(params[:id])
require_privilege(Privilege::MODIFY, @catalog_entry)
@catalog = @catalog_entry.catalog
- load_catalogs
end
def update
@@ -99,7 +97,6 @@ class CatalogEntriesController < ApplicationController
flash[:notice] = t"catalog_entries.flash.notice.updated"
redirect_to catalog_catalog_entry_path((a)catalog_entry.catalog, @catalog_entry)
else
- load_catalogs
render :action => 'edit'
end
end
diff --git a/src/app/views/catalog_entries/_form.html.haml
b/src/app/views/catalog_entries/_form.html.haml
index c7dff8b..49b9bca 100644
--- a/src/app/views/catalog_entries/_form.html.haml
+++ b/src/app/views/catalog_entries/_form.html.haml
@@ -10,8 +10,9 @@
= form.label :name, t('catalog_entries.index.name')
= form.text_field :name, :class => 'em long'
%p
- = form.label :catalog_id, t('.catalog')
- = form.select :catalog_id, @catalogs.collect{|c| [c.name, c.id]}, :selected =>
params[:catalog_entry].nil? ? @catalog.id : params[:catalog_entry][:catalog_id]
+ = form.label :catalog_id, t('catalog_entries.form.catalog')
+ = @catalog.name
+ .clear
%p
= form.label :description, t('.description')
= form.text_area :description, :class => 'long'
diff --git a/src/app/views/catalog_entries/_from_url.html.haml
b/src/app/views/catalog_entries/_from_url.html.haml
index 6afdb4d..51d86fa 100644
--- a/src/app/views/catalog_entries/_from_url.html.haml
+++ b/src/app/views/catalog_entries/_from_url.html.haml
@@ -7,7 +7,8 @@
= form.text_field :name, :class => 'em long'
%p
= form.label :catalog_id, t('catalog_entries.form.catalog')
- = form.select :catalog_id, @catalogs.collect{|c| [c.name, c.id]}, :selected =>
params[:catalog_entry].nil? ? @catalog.id : params[:catalog_entry][:catalog_id]
+ = @catalog.name
+ .clear
%p
= form.label :description, t('catalog_entries.form.description')
= form.text_area :description, :class => 'long'
diff --git a/src/app/views/catalog_entries/_upload.html.haml
b/src/app/views/catalog_entries/_upload.html.haml
index c11406f..3c02f59 100644
--- a/src/app/views/catalog_entries/_upload.html.haml
+++ b/src/app/views/catalog_entries/_upload.html.haml
@@ -7,7 +7,8 @@
= form.text_field :name, :class => 'em long'
%p
= form.label :catalog_id, t('catalog_entries.form.catalog')
- = form.select :catalog_id, @catalogs.collect{|c| [c.name, c.id]}, :selected =>
params[:catalog_entry].nil? ? @catalog.id : params[:catalog_entry][:catalog_id]
+ = @catalog.name
+ .clear
%p
= form.label :description, t('catalog_entries.form.description')
= form.text_area :description, :class => 'long'
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 8c0088c..68cdcd4 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -577,7 +577,7 @@ en:
from_url: From URL
form:
choose_xml: "Choose Deployable XML file:"
- catalog: Catalog
+ catalog: "Catalog: "
description: Description
cancel: Cancel
save: Save
--
1.7.6.4