On 01/27/2011 10:43 AM, jzigmund@redhat.com wrote:
From: Jozef Zigmundjzigmund@redhat.com
.../admin/provider_accounts_controller.rb | 32 ++++++++++++----- src/app/controllers/admin/providers_controller.rb | 2 +- src/app/helpers/admin/provider_accounts_helper.rb | 21 +++++++++++ src/app/models/provider.rb | 8 ++-- src/app/views/admin/provider_accounts/_aws.haml | 39 ++++++++++++++++++++ src/app/views/admin/provider_accounts/_gogrid.haml | 16 ++++++++ .../views/admin/provider_accounts/_opennebula.haml | 16 ++++++++ .../provider_accounts/_provider_selection.haml | 24 ++++++++++++ .../views/admin/provider_accounts/_rackspace.haml | 16 ++++++++ src/app/views/admin/provider_accounts/_rhevm.haml | 2 + src/app/views/admin/provider_accounts/new.haml | 19 ++++------ src/app/views/layouts/newui.haml | 1 - src/config/routes.rb | 3 +- 13 files changed, 172 insertions(+), 27 deletions(-) create mode 100644 src/app/helpers/admin/provider_accounts_helper.rb create mode 100644 src/app/views/admin/provider_accounts/_aws.haml create mode 100644 src/app/views/admin/provider_accounts/_gogrid.haml create mode 100644 src/app/views/admin/provider_accounts/_opennebula.haml create mode 100644 src/app/views/admin/provider_accounts/_provider_selection.haml create mode 100644 src/app/views/admin/provider_accounts/_rackspace.haml create mode 100644 src/app/views/admin/provider_accounts/_rhevm.haml
diff --git a/src/app/controllers/admin/provider_accounts_controller.rb b/src/app/controllers/admin/provider_accounts_controller.rb index e5d3ccd..41319e9 100644 --- a/src/app/controllers/admin/provider_accounts_controller.rb +++ b/src/app/controllers/admin/provider_accounts_controller.rb @@ -17,12 +17,8 @@ class Admin::ProviderAccountsController< ApplicationController
def show @tab_captions = ['Properties', 'Credentials', 'History', 'Permissions']
-<<<<<<< HEAD
- @account = CloudAccount.find(params[:id])
- require_privilege(Privilege::VIEW, @account)
-======= @account = ProviderAccount.find(params[:id]) ->>>>>>> Rename CloudAccount to ProviderAccount
- require_privilege(Privilege::VIEW, @account)
This is a merge conflict -- it looks similar to the one in the first patch -- again we just need to set @account and then run the require_privilege call
@details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab] if params.delete :test_account
diff --git a/src/app/controllers/admin/providers_controller.rb b/src/app/controllers/admin/providers_controller.rb index f06f354..aaa6c07 100644 --- a/src/app/controllers/admin/providers_controller.rb +++ b/src/app/controllers/admin/providers_controller.rb @@ -52,7 +52,7 @@ class Admin::ProvidersController< ApplicationController test_connection(@provider) render :action => 'new' else
@provider.set_cloud_type!
#@provider.set_cloud_type!
Why is this commented out? Does it need to be fixed, or is it safe to just remove it here?
if @provider.save&& @provider.populate_hardware_profiles flash[:notice] = "Provider added." redirect_to admin_providers_path
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 38445be..8539391 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -67,10 +67,10 @@ class Provider< ActiveRecord::Base return self.errors.empty? end
- def set_cloud_type!
- deltacloud = connect
- self.cloud_type = deltacloud.driver_name unless deltacloud.nil?
- end
+# def set_cloud_type! +# deltacloud = connect +# self.cloud_type = deltacloud.driver_name unless deltacloud.nil? +# end
Same question here on commented code.