[PATCH aggregator] Fixed generating of template xml
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
---
src/app/models/template.rb | 2 +-
src/spec/models/template_spec.rb | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/app/models/template.rb b/src/app/models/template.rb
index 74bf208..f660671 100644
--- a/src/app/models/template.rb
+++ b/src/app/models/template.rb
@@ -53,7 +53,7 @@ class Template < ActiveRecord::Base
xml.platform = self.platform
xml.platform_version = self.platform_version
xml.architecture = self.architecture
- write_attribute(:xml, xml.to_s)
+ write_attribute(:xml, xml.to_xml)
end
def providers
diff --git a/src/spec/models/template_spec.rb b/src/spec/models/template_spec.rb
index 94de1df..4a42996 100644
--- a/src/spec/models/template_spec.rb
+++ b/src/spec/models/template_spec.rb
@@ -29,4 +29,12 @@ describe Template do
inst.template.destroy
end.should_not change(Template, :count)
end
+
+ it "should update xml when template is saved" do
+ tpl = Factory.build(:template)
+ tpl.packages = ['test']
+ tpl.save!
+ tpl2 = Template.find(tpl)
+ tpl2.packages.should == ['test']
+ end
end
--
1.7.2.3
13 years, 5 months
[PATCH aeolus] New navigation with second level
by jzigmund＠redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
It adds new navigation to new UI.
---
src/app/views/layouts/aggregator.haml | 4 +-
src/app/views/layouts/newui.haml | 3 ++
src/config/locales/en.yml | 17 +++++++++++++
src/config/navigation.rb | 42 ---------------------------------
src/config/new_navigation.rb | 28 ++++++++++++++++++++++
src/config/old_navigation.rb | 42 +++++++++++++++++++++++++++++++++
6 files changed, 92 insertions(+), 44 deletions(-)
delete mode 100644 src/config/navigation.rb
create mode 100644 src/config/new_navigation.rb
create mode 100644 src/config/old_navigation.rb
diff --git a/src/app/views/layouts/aggregator.haml b/src/app/views/layouts/aggregator.haml
index 711f87e..4336e70 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -42,10 +42,10 @@
%a.disabled
= t(:advanced_search)
%nav.container_16
- = render_navigation(:expand_all => true, :level => 1..2)
+ = render_navigation({:context => 'old', :expand_all => true, :level => 1..2})
%hr
%nav.subnav
- = render_navigation(:expand_all => true, :level => 3)
+ = render_navigation({:context => 'old', :expand_all => true, :level => 3})
#content.container_16
= render :partial => '/layouts/notification'
= yield
diff --git a/src/app/views/layouts/newui.haml b/src/app/views/layouts/newui.haml
index c50d9a8..1d8c5fc 100644
--- a/src/app/views/layouts/newui.haml
+++ b/src/app/views/layouts/newui.haml
@@ -24,5 +24,8 @@
%body{:id => controller.section_id}
%a{ :href => '', :onClick => "document.cookie = 'layout=aggregator'"}
Switch to the old UI
+ %div#head
+ #subheader
+ = render_navigation({:context => 'new', :expand_all => true})
%h1 New UI
= yield
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 1be36b6..6201769 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -67,6 +67,23 @@ en:
apply_treatment: Apply User Treatment
choose_treatment: Choose Treatment
apply: Apply
+ resource_management_view: Resource Management View
+ pools: Pools
+ deployments: Deployments
+ instances: Instances
+ searches: Searches
+ image_factory_view: Image Factory View
+ templates: Templates
+ assemblies: Assemblies
+ template_collections: Template Collections
+ admin: Administration
+ roles: Roles
+ cloud_providers: Cloud Providers
+ provider_account: Provider Account
+ cloud_engine_hardware_profiles: HW Profiles
+ cloud_engine_realms: Realms
+ pool_families: Pool Families
+ setting: Settings
settings:
index:
general_settings: General Settings
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
deleted file mode 100644
index 27b44cf..0000000
--- a/src/config/navigation.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-SimpleNavigation::Configuration.run do |navigation|
- navigation.autogenerate_item_ids = false
- navigation.items do |first_level|
- first_level.item :operation, t(:operation), '#', :class => 'operation' do |second_level|
- second_level.item :monitor, t(:monitor), :controller => 'dashboard'
- second_level.item :browse_objects, t(:browse_objects), '#', :class => 'disabled'
- end
- first_level.item :administration, t(:administration), '#', :class => 'administration' do |second_level|
- second_level.item :system_settings, t(:system_settings), :controller => 'settings' do |third_level|
- third_level.item :manage_providers, t(:manage_providers), providers_path do |fourth_level|
- fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'providers', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/providers\/\d+(\/edit)?$/
- fourth_level.item :provider_accounts, t(:provider_accounts), { :controller => 'cloud_accounts', :action => 'index', :provider_id => (@provider.id if @provider) }, :highlights_on => /\/providers\/\d+\/accounts(\/(\d+|new))?/
- fourth_level.item :scheduling_policies, t(:scheduling_policies), '#'
- fourth_level.item :services_provided, t(:services_provided), '#'
- fourth_level.item :map_profiles, t(:map_profiles), '#'
- fourth_level.item :map_locales, t(:map_locales), '#'
- end
- third_level.item :define_services, t(:define_services), '#'
- third_level.item :define_services, t(:define_profiles), '#'
- third_level.item :define_services, t(:define_locales), '#'
- third_level.item :manage_users, t(:manage_users), :controller => 'users' do |fourth_level|
- fourth_level.item :new_user, t(:new_user), {:controller => 'users', :action => 'new'}, :highlights_on => /\/users\/new/
- fourth_level.item :edit_user, t(:edit_user), {:controller => 'users', :action => 'edit'}, :highlights_on => /\/users\/edit/
- end
- third_level.item :general_settings, t(:general_settings), {:controller => 'settings', :action => "general_settings"}
- third_level.item :permissions, t(:permissions), { :controller => 'settings', :action => 'self_service'}
- end
- second_level.item :pools_and_zones, t(:pools_and_zones), {:controller => 'pools'}, :highlights_on => /\/pools/
- second_level.item :audit_report, t(:audit_report), '#', :class => 'disabled'
- second_level.item :assistance_requests, t(:assistance_requests), '#', :class => 'disabled'
- end
- first_level.item :define, t(:define), '#', :class => 'build' do |second_level|
- second_level.item :deployables, t(:deployables), {:controller => 'templates'}, :highlights_on => /\/templates/
- second_level.item :builds, t(:builds), :controller => 'builds', :action => 'index'
- second_level.item :images, t(:images), '#', :class => 'disabled'
- end
- first_level.item :runtime, t(:runtime), '#', :class => 'runtime' do |second_level|
- second_level.item :instance_management, t(:instance_management), :controller => 'instances'
- end
- first_level.item :help, t(:help), '#', :id => 'help', :class => "disabled"
- end
-end
diff --git a/src/config/new_navigation.rb b/src/config/new_navigation.rb
new file mode 100644
index 0000000..41a1a8b
--- /dev/null
+++ b/src/config/new_navigation.rb
@@ -0,0 +1,28 @@
+SimpleNavigation::Configuration.run do |navigation|
+ navigation.autogenerate_item_ids = false
+ navigation.items do |first_level|
+ first_level.item :resource_management_view, t(:resource_management_view), '#' do |second_level|
+ second_level.item :pools, t(:pools), '#'
+ second_level.item :deployments, t(:deployments),'#'
+ second_level.item :instances, t(:instances), '#'
+ second_level.item :searches, t(:searches), '#'
+ end
+ first_level.item :image_factory_view, t(:image_factory_view), '#' do |second_level|
+ second_level.item :templates, t(:templates), '#'
+ second_level.item :assemblies, t(:assemblies),'#'
+ second_level.item :deployables, t(:deployables), '#'
+ second_level.item :template_collections, t(:template_collections), '#'
+ end
+ first_level.item :administration, t(:admin), '#' do |second_level|
+ second_level.item :users, t(:users), '#'
+ second_level.item :roles, t(:roles), '#'
+ second_level.item :cloud_providers, t(:cloud_providers), '#'
+ second_level.item :provider_account, t(:provider_account), '#'
+ second_level.item :cloud_engine_hardware_profiles, t(:cloud_engine_hardware_profiles), '#'
+ second_level.item :cloud_engine_realms, t(:cloud_engine_realms), '#'
+ second_level.item :pool_families, t(:pool_families), '#'
+ second_level.item :settings, t(:setting), '#'
+ end
+ first_level.item :dashboard, t(:dashboard), '#'
+ end
+end
diff --git a/src/config/old_navigation.rb b/src/config/old_navigation.rb
new file mode 100644
index 0000000..27b44cf
--- /dev/null
+++ b/src/config/old_navigation.rb
@@ -0,0 +1,42 @@
+SimpleNavigation::Configuration.run do |navigation|
+ navigation.autogenerate_item_ids = false
+ navigation.items do |first_level|
+ first_level.item :operation, t(:operation), '#', :class => 'operation' do |second_level|
+ second_level.item :monitor, t(:monitor), :controller => 'dashboard'
+ second_level.item :browse_objects, t(:browse_objects), '#', :class => 'disabled'
+ end
+ first_level.item :administration, t(:administration), '#', :class => 'administration' do |second_level|
+ second_level.item :system_settings, t(:system_settings), :controller => 'settings' do |third_level|
+ third_level.item :manage_providers, t(:manage_providers), providers_path do |fourth_level|
+ fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'providers', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/providers\/\d+(\/edit)?$/
+ fourth_level.item :provider_accounts, t(:provider_accounts), { :controller => 'cloud_accounts', :action => 'index', :provider_id => (@provider.id if @provider) }, :highlights_on => /\/providers\/\d+\/accounts(\/(\d+|new))?/
+ fourth_level.item :scheduling_policies, t(:scheduling_policies), '#'
+ fourth_level.item :services_provided, t(:services_provided), '#'
+ fourth_level.item :map_profiles, t(:map_profiles), '#'
+ fourth_level.item :map_locales, t(:map_locales), '#'
+ end
+ third_level.item :define_services, t(:define_services), '#'
+ third_level.item :define_services, t(:define_profiles), '#'
+ third_level.item :define_services, t(:define_locales), '#'
+ third_level.item :manage_users, t(:manage_users), :controller => 'users' do |fourth_level|
+ fourth_level.item :new_user, t(:new_user), {:controller => 'users', :action => 'new'}, :highlights_on => /\/users\/new/
+ fourth_level.item :edit_user, t(:edit_user), {:controller => 'users', :action => 'edit'}, :highlights_on => /\/users\/edit/
+ end
+ third_level.item :general_settings, t(:general_settings), {:controller => 'settings', :action => "general_settings"}
+ third_level.item :permissions, t(:permissions), { :controller => 'settings', :action => 'self_service'}
+ end
+ second_level.item :pools_and_zones, t(:pools_and_zones), {:controller => 'pools'}, :highlights_on => /\/pools/
+ second_level.item :audit_report, t(:audit_report), '#', :class => 'disabled'
+ second_level.item :assistance_requests, t(:assistance_requests), '#', :class => 'disabled'
+ end
+ first_level.item :define, t(:define), '#', :class => 'build' do |second_level|
+ second_level.item :deployables, t(:deployables), {:controller => 'templates'}, :highlights_on => /\/templates/
+ second_level.item :builds, t(:builds), :controller => 'builds', :action => 'index'
+ second_level.item :images, t(:images), '#', :class => 'disabled'
+ end
+ first_level.item :runtime, t(:runtime), '#', :class => 'runtime' do |second_level|
+ second_level.item :instance_management, t(:instance_management), :controller => 'instances'
+ end
+ first_level.item :help, t(:help), '#', :id => 'help', :class => "disabled"
+ end
+end
--
1.7.2.3
13 years, 5 months
[PATCH aeolus] Add placeholders for the new controllers and views
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
This adds empty controllers and views that we'll be using in the new UI.
They're hooked up into the routes. Visiting for example:
http://aeolus.example.com/image_factory/assemblies
will invoke the AssembliesController and render the appropriate view.
---
.../admin/hardware_profiles_controller.rb | 5 +++++
.../controllers/admin/pool_families_controller.rb | 5 +++++
.../admin/provider_accounts_controller.rb | 5 +++++
src/app/controllers/admin/providers_controller.rb | 5 +++++
src/app/controllers/admin/realms_controller.rb | 5 +++++
src/app/controllers/admin/roles_controller.rb | 5 +++++
src/app/controllers/admin/settings_controller.rb | 5 +++++
src/app/controllers/admin/users_controller.rb | 5 +++++
.../image_factory/assemblies_controller.rb | 5 +++++
.../image_factory/deployables_controller.rb | 5 +++++
.../image_factory/templates_controller.rb | 5 +++++
.../resources/deployments_controller.rb | 5 +++++
.../controllers/resources/instances_controller.rb | 5 +++++
src/app/controllers/resources/pools_controller.rb | 5 +++++
src/app/views/admin/hardware_profiles/index.haml | 1 +
src/app/views/admin/pool_families/index.haml | 1 +
src/app/views/admin/provider_accounts/index.haml | 1 +
src/app/views/admin/providers/index.haml | 1 +
src/app/views/admin/realms/index.haml | 1 +
src/app/views/admin/roles/index.haml | 1 +
src/app/views/admin/settings/index.haml | 1 +
src/app/views/admin/users/index.haml | 1 +
src/app/views/image_factory/assemblies/index.haml | 1 +
src/app/views/image_factory/deployables/index.haml | 1 +
src/app/views/image_factory/templates/index.haml | 1 +
src/app/views/resources/deployments/index.haml | 1 +
src/app/views/resources/instances/index.haml | 1 +
src/app/views/resources/pools/index.haml | 1 +
src/config/routes.rb | 11 +++++++++++
29 files changed, 95 insertions(+), 0 deletions(-)
create mode 100644 src/app/controllers/admin/hardware_profiles_controller.rb
create mode 100644 src/app/controllers/admin/pool_families_controller.rb
create mode 100644 src/app/controllers/admin/provider_accounts_controller.rb
create mode 100644 src/app/controllers/admin/providers_controller.rb
create mode 100644 src/app/controllers/admin/realms_controller.rb
create mode 100644 src/app/controllers/admin/roles_controller.rb
create mode 100644 src/app/controllers/admin/settings_controller.rb
create mode 100644 src/app/controllers/admin/users_controller.rb
create mode 100644 src/app/controllers/image_factory/assemblies_controller.rb
create mode 100644 src/app/controllers/image_factory/deployables_controller.rb
create mode 100644 src/app/controllers/image_factory/templates_controller.rb
create mode 100644 src/app/controllers/resources/deployments_controller.rb
create mode 100644 src/app/controllers/resources/instances_controller.rb
create mode 100644 src/app/controllers/resources/pools_controller.rb
create mode 100644 src/app/views/admin/hardware_profiles/index.haml
create mode 100644 src/app/views/admin/pool_families/index.haml
create mode 100644 src/app/views/admin/provider_accounts/index.haml
create mode 100644 src/app/views/admin/providers/index.haml
create mode 100644 src/app/views/admin/realms/index.haml
create mode 100644 src/app/views/admin/roles/index.haml
create mode 100644 src/app/views/admin/settings/index.haml
create mode 100644 src/app/views/admin/users/index.haml
create mode 100644 src/app/views/image_factory/assemblies/index.haml
create mode 100644 src/app/views/image_factory/deployables/index.haml
create mode 100644 src/app/views/image_factory/templates/index.haml
create mode 100644 src/app/views/resources/deployments/index.haml
create mode 100644 src/app/views/resources/instances/index.haml
create mode 100644 src/app/views/resources/pools/index.haml
diff --git a/src/app/controllers/admin/hardware_profiles_controller.rb b/src/app/controllers/admin/hardware_profiles_controller.rb
new file mode 100644
index 0000000..ceffce1
--- /dev/null
+++ b/src/app/controllers/admin/hardware_profiles_controller.rb
@@ -0,0 +1,5 @@
+class Admin::HardwareProfilesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/pool_families_controller.rb b/src/app/controllers/admin/pool_families_controller.rb
new file mode 100644
index 0000000..17e0b8f
--- /dev/null
+++ b/src/app/controllers/admin/pool_families_controller.rb
@@ -0,0 +1,5 @@
+class Admin::PoolFamiliesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/provider_accounts_controller.rb b/src/app/controllers/admin/provider_accounts_controller.rb
new file mode 100644
index 0000000..6e353df
--- /dev/null
+++ b/src/app/controllers/admin/provider_accounts_controller.rb
@@ -0,0 +1,5 @@
+class Admin::ProviderAccountsController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/providers_controller.rb b/src/app/controllers/admin/providers_controller.rb
new file mode 100644
index 0000000..d9035f5
--- /dev/null
+++ b/src/app/controllers/admin/providers_controller.rb
@@ -0,0 +1,5 @@
+class Admin::ProvidersController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/realms_controller.rb b/src/app/controllers/admin/realms_controller.rb
new file mode 100644
index 0000000..6d09873
--- /dev/null
+++ b/src/app/controllers/admin/realms_controller.rb
@@ -0,0 +1,5 @@
+class Admin::RealmsController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/roles_controller.rb b/src/app/controllers/admin/roles_controller.rb
new file mode 100644
index 0000000..821effe
--- /dev/null
+++ b/src/app/controllers/admin/roles_controller.rb
@@ -0,0 +1,5 @@
+class Admin::RolesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/settings_controller.rb b/src/app/controllers/admin/settings_controller.rb
new file mode 100644
index 0000000..2176fc5
--- /dev/null
+++ b/src/app/controllers/admin/settings_controller.rb
@@ -0,0 +1,5 @@
+class Admin::SettingsController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/admin/users_controller.rb b/src/app/controllers/admin/users_controller.rb
new file mode 100644
index 0000000..62b733e
--- /dev/null
+++ b/src/app/controllers/admin/users_controller.rb
@@ -0,0 +1,5 @@
+class Admin::UsersController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/image_factory/assemblies_controller.rb b/src/app/controllers/image_factory/assemblies_controller.rb
new file mode 100644
index 0000000..531fb9e
--- /dev/null
+++ b/src/app/controllers/image_factory/assemblies_controller.rb
@@ -0,0 +1,5 @@
+class ImageFactory::AssembliesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/image_factory/deployables_controller.rb b/src/app/controllers/image_factory/deployables_controller.rb
new file mode 100644
index 0000000..351ed06
--- /dev/null
+++ b/src/app/controllers/image_factory/deployables_controller.rb
@@ -0,0 +1,5 @@
+class ImageFactory::DeployablesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/image_factory/templates_controller.rb b/src/app/controllers/image_factory/templates_controller.rb
new file mode 100644
index 0000000..1b204cf
--- /dev/null
+++ b/src/app/controllers/image_factory/templates_controller.rb
@@ -0,0 +1,5 @@
+class ImageFactory::TemplatesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/resources/deployments_controller.rb b/src/app/controllers/resources/deployments_controller.rb
new file mode 100644
index 0000000..de9d529
--- /dev/null
+++ b/src/app/controllers/resources/deployments_controller.rb
@@ -0,0 +1,5 @@
+class Resources::DeploymentsController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/resources/instances_controller.rb b/src/app/controllers/resources/instances_controller.rb
new file mode 100644
index 0000000..e435cf1
--- /dev/null
+++ b/src/app/controllers/resources/instances_controller.rb
@@ -0,0 +1,5 @@
+class Resources::InstancesController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/controllers/resources/pools_controller.rb b/src/app/controllers/resources/pools_controller.rb
new file mode 100644
index 0000000..84956b8
--- /dev/null
+++ b/src/app/controllers/resources/pools_controller.rb
@@ -0,0 +1,5 @@
+class Resources::PoolsController < ApplicationController
+
+ def index
+ end
+end
diff --git a/src/app/views/admin/hardware_profiles/index.haml b/src/app/views/admin/hardware_profiles/index.haml
new file mode 100644
index 0000000..dd779f7
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/index.haml
@@ -0,0 +1 @@
+admin/hardware_profiles/index.haml
diff --git a/src/app/views/admin/pool_families/index.haml b/src/app/views/admin/pool_families/index.haml
new file mode 100644
index 0000000..e50f43b
--- /dev/null
+++ b/src/app/views/admin/pool_families/index.haml
@@ -0,0 +1 @@
+admin/pool_families/index.haml
diff --git a/src/app/views/admin/provider_accounts/index.haml b/src/app/views/admin/provider_accounts/index.haml
new file mode 100644
index 0000000..72c0ee2
--- /dev/null
+++ b/src/app/views/admin/provider_accounts/index.haml
@@ -0,0 +1 @@
+admin/provider_accounts/index.haml
diff --git a/src/app/views/admin/providers/index.haml b/src/app/views/admin/providers/index.haml
new file mode 100644
index 0000000..589bac8
--- /dev/null
+++ b/src/app/views/admin/providers/index.haml
@@ -0,0 +1 @@
+admin/providers/index.haml
diff --git a/src/app/views/admin/realms/index.haml b/src/app/views/admin/realms/index.haml
new file mode 100644
index 0000000..374f27a
--- /dev/null
+++ b/src/app/views/admin/realms/index.haml
@@ -0,0 +1 @@
+admin/realms/index.haml
diff --git a/src/app/views/admin/roles/index.haml b/src/app/views/admin/roles/index.haml
new file mode 100644
index 0000000..d063630
--- /dev/null
+++ b/src/app/views/admin/roles/index.haml
@@ -0,0 +1 @@
+admin/roles/index.haml
diff --git a/src/app/views/admin/settings/index.haml b/src/app/views/admin/settings/index.haml
new file mode 100644
index 0000000..e87f648
--- /dev/null
+++ b/src/app/views/admin/settings/index.haml
@@ -0,0 +1 @@
+admin/settings/index.haml
diff --git a/src/app/views/admin/users/index.haml b/src/app/views/admin/users/index.haml
new file mode 100644
index 0000000..606d747
--- /dev/null
+++ b/src/app/views/admin/users/index.haml
@@ -0,0 +1 @@
+admin/users/index.haml
diff --git a/src/app/views/image_factory/assemblies/index.haml b/src/app/views/image_factory/assemblies/index.haml
new file mode 100644
index 0000000..766d92c
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/index.haml
@@ -0,0 +1 @@
+image_factory/assemblies/index.haml
diff --git a/src/app/views/image_factory/deployables/index.haml b/src/app/views/image_factory/deployables/index.haml
new file mode 100644
index 0000000..edd58fc
--- /dev/null
+++ b/src/app/views/image_factory/deployables/index.haml
@@ -0,0 +1 @@
+image_factory/deployables/index.haml
diff --git a/src/app/views/image_factory/templates/index.haml b/src/app/views/image_factory/templates/index.haml
new file mode 100644
index 0000000..689b39b
--- /dev/null
+++ b/src/app/views/image_factory/templates/index.haml
@@ -0,0 +1 @@
+image_factory/templates/index.haml
diff --git a/src/app/views/resources/deployments/index.haml b/src/app/views/resources/deployments/index.haml
new file mode 100644
index 0000000..fdc537d
--- /dev/null
+++ b/src/app/views/resources/deployments/index.haml
@@ -0,0 +1 @@
+resources/deployments/index.haml
diff --git a/src/app/views/resources/instances/index.haml b/src/app/views/resources/instances/index.haml
new file mode 100644
index 0000000..0354016
--- /dev/null
+++ b/src/app/views/resources/instances/index.haml
@@ -0,0 +1 @@
+resources/instances/index.haml
diff --git a/src/app/views/resources/pools/index.haml b/src/app/views/resources/pools/index.haml
new file mode 100644
index 0000000..5716106
--- /dev/null
+++ b/src/app/views/resources/pools/index.haml
@@ -0,0 +1 @@
+resources/pools/index.haml
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 146e16f..fc3a36a 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -32,6 +32,17 @@ ActionController::Routing::Routes.draw do |map|
# You can have the root of your site routed by hooking up ''
# -- just remember to delete public/index.html.
+ map.namespace 'resources' do
+ map.resources :pools, :instances, :deployments
+ end
+
+ map.namespace 'image_factory' do
+ map.resources :assemblies, :deployables, :templates
+ end
+
+ map.namespace 'admin' do
+ map.resources :hardware_profiles, :pool_families, :providers, :realms, :roles, :settings, :users
+ end
map.resources :pools
--
1.7.3.2
13 years, 5 months
The New UI
by Tomas Sedovic
This patch begins the migration to the new UI for Aeolus. The current UI is
still functional. There's a link on the top left corner that switches between
the two.
Once we have the new UI in place and working, this code and the old stuff will
go away.
13 years, 5 months
Selecting collection in template SW selection
by Jan Provazník
Hi,
this patch re-eanbles selecting collections (all packages from collection are added). I think it's better to keep this hack in model because users could be confused, though we should rework sw selection views soon (I hope).
13 years, 5 months
[PATCH aeolus 1/2] Updated links on manage users page
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/views/users/index.haml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/app/views/users/index.haml b/src/app/views/users/index.haml
index d0a5d7e..8ec3178 100644
--- a/src/app/views/users/index.haml
+++ b/src/app/views/users/index.haml
@@ -26,16 +26,18 @@
=link_to "Quota", users_url(:sort_by => "quota")
%span (Instances)
%th= link_to "e-mail", users_url(:sort_by => "email")
+ %th
-(a)users.each do |user|
%tr
%td
%input{:name => "user_checkbox", :type => "radio", :value => user.id, :id => "user_checkbox_#{user.id}" }
- %td= link_to user.login, {:action => "edit", :id => user.id}
+ %td= link_to user.login, user_path(user)
%td= user.last_name
%td= user.first_name
%td= sprintf("%.2f", user.quota.percentage_used)
%td= Quota.no_limit(user.quota.maximum_running_instances) ? "Unlimited" : user.quota.maximum_running_instances
%td= user.email
+ %td= link_to "edit", edit_user_path(user)
:javascript
$(document).ready(function () {
--
1.7.2.3
13 years, 5 months
[PATCH aeolus 1/2] Updated links on manage users page
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/views/users/index.haml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/app/views/users/index.haml b/src/app/views/users/index.haml
index d0a5d7e..8ec3178 100644
--- a/src/app/views/users/index.haml
+++ b/src/app/views/users/index.haml
@@ -26,16 +26,18 @@
=link_to "Quota", users_url(:sort_by => "quota")
%span (Instances)
%th= link_to "e-mail", users_url(:sort_by => "email")
+ %th
-(a)users.each do |user|
%tr
%td
%input{:name => "user_checkbox", :type => "radio", :value => user.id, :id => "user_checkbox_#{user.id}" }
- %td= link_to user.login, {:action => "edit", :id => user.id}
+ %td= link_to user.login, user_path(user)
%td= user.last_name
%td= user.first_name
%td= sprintf("%.2f", user.quota.percentage_used)
%td= Quota.no_limit(user.quota.maximum_running_instances) ? "Unlimited" : user.quota.maximum_running_instances
%td= user.email
+ %td= link_to "edit", edit_user_path(user)
:javascript
$(document).ready(function () {
--
1.7.2.3
13 years, 5 months