[PATCH conductor] BZ#795921 Unsupported provider types are not listed in UI
Tomáš Hrčka
thrcka at redhat.com
Wed Feb 22 13:33:56 UTC 2012
On 02/22/2012 02:03 PM, Imre Farkas wrote:
> On 02/22/2012 01:01 PM, Tomáš Hrčka wrote:
>> https://bugzilla.redhat.com/show_bug.cgi?id=795921
>> ---
>> src/app/controllers/providers_controller.rb | 6 ++++++
>> src/app/views/providers/_form.html.haml | 2 +-
>> 2 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/app/controllers/providers_controller.rb
>> b/src/app/controllers/providers_controller.rb
>> index 340955d..dfbe7c2 100644
>> --- a/src/app/controllers/providers_controller.rb
>> +++ b/src/app/controllers/providers_controller.rb
>> @@ -17,6 +17,7 @@
>> class ProvidersController< ApplicationController
>> before_filter :require_user
>> before_filter :load_providers, :only => [:index, :show, :new,
>> :edit, :create, :update]
>> + before_filter :load_providers_types, :only => [:new, :edit]
>>
>> def index
>> @params = params
>> @@ -46,6 +47,7 @@ class ProvidersController< ApplicationController
>> @provider = Provider.new
>> @provider.url = Provider::DEFAULT_DELTACLOUD_URL
>> @title = t("providers.new.new_provider")
>> +
>> end
> I think this new empty line is redundant here.
>
>>
>> def edit
>> @@ -235,6 +237,10 @@ class ProvidersController< ApplicationController
>> return alerts
>> end
>>
>> + def load_providers_types
>> + @provider_types = ProviderType.where(:name => ["Mock","Amazon
>> EC2","RHEV-M","VMware vSphere"]).collect {|provider_type|
>> [provider_type.name,provider_type.id]}
>> + end
>> +
>> def load_provider_tabs
>> @realms = @provider.realms.apply_filters(:preset_filter_id =>
>> params[:provider_realms_preset_filter], :search_filter =>
>> params[:provider_realms_search])
>> #TODO add links to real data for history,properties,permissions
>> diff --git a/src/app/views/providers/_form.html.haml
>> b/src/app/views/providers/_form.html.haml
>> index fe8f17f..e66f64a 100644
>> --- a/src/app/views/providers/_form.html.haml
>> +++ b/src/app/views/providers/_form.html.haml
>> @@ -9,7 +9,7 @@
>> = form.text_field :url, :title =>
>> t('providers.form.provider_url'), :value => @provider.url, :class
>> => 'long'
>> %p
>> = form.label :provider_type, t('providers.form.provider_type')
>> - = form.select(:provider_type_id, ProviderType.all.collect
>> {|provider_type| [provider_type.name,provider_type.id] }, :prompt =>
>> t('providers.form.select_type_of_provider'))
>> + = form.select(:provider_type_id, @provider_types, :prompt =>
>> t('providers.form.select_type_of_provider'))
>> %p
>> = form.label :url, t('providers.form.x_deltacloud_provider')
>> = form.text_field :deltacloud_provider, :title =>
>> t('providers.form.x_deltacloud_provider'), :value =>
>> @provider.deltacloud_provider, :class => 'long'
>
> ACK with 1 inline note
Thanks fixed and pushed
More information about the aeolus-devel
mailing list