[PATCH conductor] BZ761132 fix broken translations for template xml
by Tomas Sedovic
From: Tomas Sedovic <tomas(a)sedovic.cz>
https://bugzilla.redhat.com/show_bug.cgi?id=761132
---
src/app/controllers/images_controller.rb | 2 +-
src/app/models/template_xml.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 7c99906..a178596 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -103,7 +103,7 @@ class ImagesController < ApplicationController
begin
xml_source = RestClient.get(url, :accept => :xml)
rescue RestClient::Exception, SocketError, URI::InvalidURIError
- flash.now[:error] = t('template_xml.flash.error.invalid_url')
+ flash.now[:error] = t('images.flash.error.invalid_url')
render :new and return
end
else
diff --git a/src/app/models/template_xml.rb b/src/app/models/template_xml.rb
index c58b5cb..149c9c5 100644
--- a/src/app/models/template_xml.rb
+++ b/src/app/models/template_xml.rb
@@ -39,7 +39,7 @@ class TemplateXML
begin
doc = TemplateXML.new(xmlstr)
rescue Nokogiri::XML::SyntaxError
- return [I18n.t('template_xml.errors.xml_parser_error')]
+ return [I18n.t('template_xml.errors.xml_parse_error')]
end
return doc.validate
end
--
1.7.6.4
12 years, 5 months
[PATCH conductor] Fix flash message in images_controller#edit_xml
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/controllers/images_controller.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 7c99906..a178596 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -103,7 +103,7 @@ class ImagesController < ApplicationController
begin
xml_source = RestClient.get(url, :accept => :xml)
rescue RestClient::Exception, SocketError, URI::InvalidURIError
- flash.now[:error] = t('template_xml.flash.error.invalid_url')
+ flash.now[:error] = t('images.flash.error.invalid_url')
render :new and return
end
else
--
1.7.7.3
12 years, 5 months
aeolus-image-rubygem integration in conductor
by Jan Provazník
Hi,
ATM there is little bit mess in using aeolus-image-rubygem - api
controllers and new code in UI controllers use aeolus-image-rubygem, but
before aeolus-image-rubygem existed there already were warehouse models
definitions in conductor (which was apparently used as basic for
aeolus-image-rubygem later).
This code wasn't replaced when new aeolus-image-rugem was added into
conductor, so now we have warehouse_model and warehous_client libs in
conductor lib and Image, ImageBuild, Provider Image,... models which are
simialr to models in aeolsu-image-rubygem.
Is there already some task to clean this mess or are we going to stick
with this for 1.0 release?
Jan
12 years, 5 months
[PATCH conductor] Disabling Add button if no available catalog exists
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=760912
---
src/app/views/deployables/show.html.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index 06964b2..f89ac19 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -87,7 +87,7 @@
= f.label :catalog_id, t('catalog_entries.show.choose_catalog')
= f.select :catalog_id, options_for_select((a)catalogs_options.map {|c| [c.name, c.id]})
= f.hidden_field(:deployable_id, :value => @deployable.id)
- = f.submit t('catalog_entries.show.add_catalog'), :id => :add_catalog, :class => 'button pill'
+ = f.submit t('catalog_entries.show.add_catalog'), :id => :add_catalog, :class => 'button pill', :disabled => @catalogs_options.empty?
.content
.centered
%table.light_table
--
1.7.6.4
12 years, 5 months
[PATCH conductor] Condition added to XML validation in Deployable
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=756690
---
src/app/controllers/catalog_entries_controller.rb | 3 +--
src/app/models/deployable.rb | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/controllers/catalog_entries_controller.rb b/src/app/controllers/catalog_entries_controller.rb
index 465e741..0c4a31d 100644
--- a/src/app/controllers/catalog_entries_controller.rb
+++ b/src/app/controllers/catalog_entries_controller.rb
@@ -105,8 +105,7 @@ class CatalogEntriesController < ApplicationController
@catalog_entry.deployable.name = @image.name
else
params.delete(:edit_xml) if params[:edit_xml]
- @form_option = params[:catalog_entry].has_key?(:xml) ? 'upload' : 'from_url'
- @form_option = params[:catalog_entry][:deployable].has_key?(:xml) ? 'upload' : 'from_url'
+ @form_option = params.has_key?(:url) ? 'from_url' : 'upload'
end
render :new
end
diff --git a/src/app/models/deployable.rb b/src/app/models/deployable.rb
index 8f869a4..f67b9aa 100644
--- a/src/app/models/deployable.rb
+++ b/src/app/models/deployable.rb
@@ -24,7 +24,7 @@ class Deployable < ActiveRecord::Base
validates_length_of :name, :maximum => 1024
validates_presence_of :xml
- validate :valid_deployable_xml?
+ validate :valid_deployable_xml?, :if => Proc.new { |deployable| !deployable.xml.blank? }
has_many :permissions, :as => :permission_object, :dependent => :destroy,
:include => [:role],
--
1.7.6.4
12 years, 5 months
[PATCH conductor] Fixed deprecation warning in pool_families#edit
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/views/pool_families/edit.html.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/pool_families/edit.html.haml b/src/app/views/pool_families/edit.html.haml
index ff9d3e3..ebfa9a4 100644
--- a/src/app/views/pool_families/edit.html.haml
+++ b/src/app/views/pool_families/edit.html.haml
@@ -11,5 +11,5 @@
%h2.settings= t("settings.settings")
.content
- -form_for @pool_family, :url => pool_family_path(@pool_family), :html => { :method => :put, :class => 'generic' } do |f|
+ = form_for @pool_family, :url => pool_family_path(@pool_family), :html => { :method => :put, :class => 'generic' } do |f|
= render :partial => 'form', :locals => { :form => f, :cancel_path => providers_path }
--
1.7.7.3
12 years, 5 months
[PATCH conductor] Remove "load definition from XML" option from launch new deployment page
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=760940
---
src/app/views/deployments/_launch_new.html.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/deployments/_launch_new.html.haml b/src/app/views/deployments/_launch_new.html.haml
index 87ff422..d8e62f5 100644
--- a/src/app/views/deployments/_launch_new.html.haml
+++ b/src/app/views/deployments/_launch_new.html.haml
@@ -31,7 +31,7 @@
%p
%label{:for => 'deployable_id'}
= t('catalog_entries.index.deployable')
- = select_tag :deployable_id, options_for_select([[t('.load_definition'), t('.other')]] + @deployables.map {|d| [d.name, d.id]}, params[:deployable_id])
+ = select_tag :deployable_id, options_for_select((a)deployables.map {|d| [d.name, d.id]}, params[:deployable_id])
%fieldset
%p
--
1.7.6.4
12 years, 5 months
recently opened bugs
by wes hayutin
Please take a look if you have some time.
> bug_id assigned_to bug_status short_desc blockedby
> 761284 athomas(a)redhat.com NEW create a deployable from imported image error 744194
> 761282 athomas(a)redhat.com NEW import with image description results in empty details, no link to image 744194
> 761279 athomas(a)redhat.com NEW import image displays 'upload' button in web ui 744194
> 761254 jrd(a)redhat.com NEW imagefactory only allows one image to be built
> 761218 athomas(a)redhat.com NEW no image name given issue 744194
> 761200 athomas(a)redhat.com NEW error in image build results in web ui internal server error 744194
> 761177 athomas(a)redhat.com NEW disabled providers still allow a new image to be built/push
> 761160 athomas(a)redhat.com NEW import then push fails 744194
> 761139 athomas(a)redhat.com NEW new image xml validator should force rootpw element 744194
> 761134 athomas(a)redhat.com NEW create image -> upload file -> needs no file selected check 744194
> 761132 athomas(a)redhat.com NEW translation missing 744194
> 761109 imcleod(a)redhat.com NEW build/push RHEL 6.2 in ec2 blocked by RHEL issue bz# 761086 744194
> 761096 athomas(a)redhat.com NEW No route matches {:viewstate=>nil, :controller=>"deployables"} 744194
> 761088 athomas(a)redhat.com NEW remove download key link from non-ec2 deployment instances 744194
> 761079 athomas(a)redhat.com NEW No route matches "/conductor/deployments/1?details_tab=instances&only_tab=true" 744194
> 760661 athomas(a)redhat.com NEW conflicting terms while uploading catalog entry
> 760589 athomas(a)redhat.com NEW images page misrendered in chrome 744194
12 years, 5 months
[PATCH conductor] Replaced new_catalog_entry_path with new_deployable_path to work with new controller structure
by Scott Seago
---
src/app/views/images/show.html.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
index 707cce3..802a994 100644
--- a/src/app/views/images/show.html.haml
+++ b/src/app/views/images/show.html.haml
@@ -6,7 +6,7 @@
= link_to t('images.index.images'), images_path
.button-group
= button_to t("delete"), image_path((a)image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
- = link_to t('.new_deployable_from_image'), new_catalog_entry_path(:create_from_image => @image.id)
+ = link_to t('.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id)
%section.admin-content-section
%header
--
1.7.6.4
12 years, 5 months