[PATCH configure] Update imagefactory config file to include warehouse OAuth keys
by Richard Su
---
recipes/aeolus/templates/imagefactory.conf | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/recipes/aeolus/templates/imagefactory.conf b/recipes/aeolus/templates/imagefactory.conf
index 7969719..89b1fb7 100644
--- a/recipes/aeolus/templates/imagefactory.conf
+++ b/recipes/aeolus/templates/imagefactory.conf
@@ -1,5 +1,7 @@
{
"warehouse": "http://localhost:9090/",
+ "warehouse_key": "<%= iwhd_oauth_user %>",
+ "warehouse_secret": "<%= iwhd_oauth_password %>",
"image_bucket": "images",
"build_bucket": "builds",
"target_bucket": "target_images",
@@ -11,5 +13,6 @@
"ec2_ami_type": "s3",
"clients": {
"<%= imagefactory_oauth_user %>": "<%= imagefactory_oauth_password %>"
- }
+ },
+ "proxy_ami_id": "ami-id"
}
--
1.7.6.4
12 years, 6 months
[PATCH conductor 1/2] Move config server strings to the i18n dictionary
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
https://www.aeolusproject.org/redmine/issues/2610
---
src/app/controllers/config_servers_controller.rb | 14 +++++++-------
.../views/config_servers/_config_server_form.haml | 10 +++++-----
src/app/views/config_servers/_section_header.haml | 2 +-
src/app/views/config_servers/edit.haml | 2 +-
src/app/views/config_servers/new.haml | 2 +-
src/config/locales/en.yml | 20 +++++++++++++++++++-
6 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/config_servers_controller.rb b/src/app/controllers/config_servers_controller.rb
index 03fc28f..7f29a6d 100644
--- a/src/app/controllers/config_servers_controller.rb
+++ b/src/app/controllers/config_servers_controller.rb
@@ -25,7 +25,7 @@ class ConfigServersController < ApplicationController
if not config_server.connection_valid?
flash[:error] = config_server.connection_error_msg
else
- flash[:notice] = "Test successful"
+ flash[:notice] = t('config_servers.flash.notice.test_successful')
end
provider_account = config_server.provider_account
provider = provider_account.provider
@@ -41,11 +41,11 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.new(params[:config_server])
@config_server.provider_account = @provider_account
if @config_server.invalid?
- flash[:error] = "The config server information is invalid."
+ flash[:error] = t('config_servers.flash.error.invalid')
render :action => 'new' and return
end
@config_server.save!
- flash[:notice] = "Config server added."
+ flash[:notice] = t('config_servers.flash.notice.added')
redirect_to provider_provider_account_path((a)provider_account.provider, @provider_account)
end
@@ -55,10 +55,10 @@ class ConfigServersController < ApplicationController
require_privilege(Privilege::MODIFY, @provider_account)
if @config_server.update_attributes(params[:config_server])
- flash[:notice] = "Config server updated."
+ flash[:notice] = t('config_servers.flash.notice.updated')
redirect_to provider_provider_account_path((a)provider_account.provider, @provider_account)
else
- flash[:error] = "Config server was not updated"
+ flash[:error] = t('config_servers.flash.error.not_updated')
render :action => :edit
end
end
@@ -67,9 +67,9 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.find(params[:id])
require_privilege(Privilege::MODIFY, @config_server.provider_account)
if ConfigServer.destroy(params[:id])
- flash[:notice] = "Config server was deleted."
+ flash[:notice] = t('config_servers.flash.notice.deleted')
else
- flash[:error] = "Config server was not deleted"
+ flash[:error] = t('config_servers.flash.error.not_deleted')
end
provider_account = @config_server.provider_account
provider = provider_account.provider
diff --git a/src/app/views/config_servers/_config_server_form.haml b/src/app/views/config_servers/_config_server_form.haml
index 4896778..ebbd1f4 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -3,19 +3,19 @@
%fieldset
%p
= hidden_field_tag "provider_account_id", @provider_account.id
- = form.label :host
+ = form.label :host, t('.host')
= form.text_field :host, :class => 'em long'
%p
- = form.label :port
+ = form.label :port, t('.port')
= form.text_field :port
%p
- = form.label :username
+ = form.label :username, t('.username')
= form.text_field :username
%p
- = form.label :password
+ = form.label :password, t('.password')
= password_field_tag "config_server[password]", @config_server.password
%p
- = form.label :certificate
+ = form.label :certificate, t('.certificate')
%div.help
= t('config_servers.certificate_help')
= form.text_area :certificate, :rows => 20, :cols => 64
diff --git a/src/app/views/config_servers/_section_header.haml b/src/app/views/config_servers/_section_header.haml
index d8e75fe..bdf4b48 100644
--- a/src/app/views/config_servers/_section_header.haml
+++ b/src/app/views/config_servers/_section_header.haml
@@ -1,3 +1,3 @@
%header.page-header
- %h1{:class => controller.controller_name} Config Server
+ %h1{:class => controller.controller_name}= t('.config_server')
.corner
diff --git a/src/app/views/config_servers/edit.haml b/src/app/views/config_servers/edit.haml
index 07b3abe..b0586a6 100644
--- a/src/app/views/config_servers/edit.haml
+++ b/src/app/views/config_servers/edit.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 Edit Config Server
+ %h2= t('.edit_config_server')
.content
= form_for @config_server, :url => config_server_path(@config_server), :html => {:method => :put, :class => "generic"} do |f|
diff --git a/src/app/views/config_servers/new.haml b/src/app/views/config_servers/new.haml
index 9ea48b2..8495f73 100644
--- a/src/app/views/config_servers/new.haml
+++ b/src/app/views/config_servers/new.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 New Config Server
+ %h2= t('.new_config_server')
.content
= form_for @config_server, :url => config_servers_path, :html => {:class => "generic"} do |f|
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 86b1cec..f5bc69b 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -692,10 +692,28 @@ en:
must_select_account: "You must select some accounts first."
config_servers:
certificate_help: Provide a certificate to enable https support
+ section_header:
+ config_server: Config Server
new:
new_config_server: New Config Server
edit:
edit_config_server: Edit Config Server
+ config_server_form:
+ host: Host
+ port: Port
+ username: Username
+ password: Password
+ certificate: Certificate
+ flash:
+ notice:
+ test_successful: Test successful
+ added: Config server added.
+ updated: Config server updated.
+ deleted: Config server was deleted.
+ error:
+ invalid: The config server information is invalid.
+ not_updated: Config server was not updated
+ not_deleted: Config server was not deleted
errors:
connection:
generic: "Could not validate config server connection (url: %{url}). Check the connection parameters and try again."
@@ -778,4 +796,4 @@ en:
admin_tabs:
catalogs: Catalogs
realms: Realms
- hardware: Hardware
\ No newline at end of file
+ hardware: Hardware
--
1.7.6.4
12 years, 6 months
[PATCH] write iwhd oauth config to users.js config instead of init script
by Mo Morsi
---
recipes/aeolus/manifests/iwhd.pp | 8 +++++++-
recipes/aeolus/templates/iwhd-users.js | 1 +
recipes/aeolus/templates/iwhd.init | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 recipes/aeolus/templates/iwhd-users.js
diff --git a/recipes/aeolus/manifests/iwhd.pp b/recipes/aeolus/manifests/iwhd.pp
index de0209b..2ceb03e 100644
--- a/recipes/aeolus/manifests/iwhd.pp
+++ b/recipes/aeolus/manifests/iwhd.pp
@@ -35,6 +35,11 @@ class aeolus::iwhd inherits aeolus {
mode => 755,
require => Package['iwhd'] }
+ file {"/etc/iwhd/users.js":
+ content => template("aeolus/iwhd-users.js"),
+ mode => 755,
+ require => Package['iwhd'] }
+
service { 'mongod':
ensure => 'running',
enable => true,
@@ -46,7 +51,8 @@ class aeolus::iwhd inherits aeolus {
hasstatus => true,
require => [Service[mongod],
File['/var/lib/iwhd',
- '/etc/init.d/iwhd']]}
+ '/etc/init.d/iwhd',
+ '/etc/iwhd/users.js']]}
# XXX ugly hack but iwhd might take some time to come up
exec{"iwhd_startup_pause":
diff --git a/recipes/aeolus/templates/iwhd-users.js b/recipes/aeolus/templates/iwhd-users.js
new file mode 100644
index 0000000..236a22e
--- /dev/null
+++ b/recipes/aeolus/templates/iwhd-users.js
@@ -0,0 +1 @@
+[ { "name":"<%= iwhd_oauth_user %>", "secret":"<%= iwhd_oauth_password %>" } ]
diff --git a/recipes/aeolus/templates/iwhd.init b/recipes/aeolus/templates/iwhd.init
index 12617a0..1247801 100755
--- a/recipes/aeolus/templates/iwhd.init
+++ b/recipes/aeolus/templates/iwhd.init
@@ -83,7 +83,7 @@ start() {
echo
printf %s $"Starting $SERVICE daemon: "
- $PROCESS -c "$CONFIG_JS" $IWHD_ARGS -o -U <%= iwhd_oauth_user %>:<%= iwhd_oauth_password %>&
+ $PROCESS -c "$CONFIG_JS" $IWHD_ARGS -o -u /etc/iwhd/users.js &
pid=$!
RETVAL=$?
if test $RETVAL = 0; then
--
1.7.6.4
12 years, 6 months
Re: [PATCH aeolus-image-rubygem 0/1] Bugfix for my warehouse client
by Matt Wagner
Pushed.
----- Forwarded message from Richard Su <rwsu(a)redhat.com> -----
Date: Mon, 24 Oct 2011 12:52:16 -0700
From: Richard Su <rwsu(a)redhat.com>
To: Matt Wagner <matt.wagner(a)redhat.com>
Subject: Re: [PATCH aeolus-image-rubygem 0/1] Bugfix for my warehouse client
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0
On 10/24/2011 11:38 AM, Matt Wagner wrote:
> This fixes the nasty bug where you can't add provider accounts and maybe some of the 500 errors in aeolus-image.
> _______________________________________________
> aeolus-devel mailing list
> aeolus-devel(a)lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/aeolus-devel
Ack.
----- End forwarded message -----
12 years, 6 months
[PATCH conductor] Next revision of strings for i18n
by jzigmund@redhat.com
Changed strings in these views of the controllers:
- Settings
- Roles
- Realms
- RealmMappings
- Quotas
- Permissions
- ProviderAccounts
+ added new keys/values for those strings to dictionaries.
12 years, 6 months
[PATCH conductor] Ensure that all strings in views of Providers are i18n compliant
by Tomas Hrcka
---
src/app/controllers/providers_controller.rb | 10 ++++----
src/app/views/providers/_form.html.haml | 16 ++++++------
src/app/views/providers/_properties.html.haml | 12 ++++----
src/app/views/providers/_section_header.html.haml | 10 ++++----
src/app/views/providers/edit.html.haml | 15 ++++-------
src/app/views/providers/index.html.haml | 4 +-
src/app/views/providers/new.html.haml | 10 ++++----
src/app/views/providers/show.html.haml | 2 +-
src/config/locales/en.yml | 27 +++++++++++++++++++-
9 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index 09ee13d..a219fdf 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -76,8 +76,8 @@ class ProvidersController < ApplicationController
@realm_names = @provider.realms.collect { |r| r.name }
require_privilege(Privilege::VIEW, @provider)
- @tab_captions = ['Properties', 'HW Profiles', 'Realms', 'Provider Accounts', 'Services', 'History', 'Permissions']
- @details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
+ @tab_captions = [t("properties"), t('hw_profiles'), t('realm_s'), t("provider_accounts.index.provider_accounts"), t('services'), t('history'), t('permissions')]
+ @details_tab = params[:details_tab].blank? ? t("properties") : params[:details_tab]
if params.delete :test_provider
test_connection(@provider)
@@ -209,9 +209,9 @@ class ProvidersController < ApplicationController
def load_provider_tabs
@realms = @provider.all_associated_frontend_realms
#TODO add links to real data for history,properties,permissions
- @tabs = [{:name => 'Connectivity', :view => 'edit', :id => 'connectivity', :count => @provider.provider_accounts.count},
- {:name => 'Accounts', :view => 'provider_accounts/list', :id => 'accounts', :count => @provider.provider_accounts.count},
- {:name => 'Realms', :view => 'realms/list', :id => 'realms', :count => @realms.count},
+ @tabs = [{:name => t('connectivity'), :view => 'edit', :id => 'connectivity', :count => @provider.provider_accounts.count},
+ {:name => t('accounts'), :view => 'provider_accounts/list', :id => 'accounts', :count => @provider.provider_accounts.count},
+ {:name => t('realm_s'), :view => 'realms/list', :id => 'realms', :count => @realms.count},
#{:name => 'Roles & Permissions', :view => @view, :id => 'roles', :count => @provider.permissions.count},
]
add_permissions_tab(@provider, "edit_")
diff --git a/src/app/views/providers/_form.html.haml b/src/app/views/providers/_form.html.haml
index 75d504e..fe8f17f 100644
--- a/src/app/views/providers/_form.html.haml
+++ b/src/app/views/providers/_form.html.haml
@@ -2,14 +2,14 @@
= render 'layouts/error_messages', :object => @provider
%fieldset
%p
- = form.label :name,'Provider name:'
- = form.text_field :name, :title => 'provider_name', :value => @provider.name, :class => 'long'
+ = form.label :name, t('providers.form.provider_name')
+ = form.text_field :name, :title => t('providers.form.provider_name'), :value => @provider.name, :class => 'long'
%p
- = form.label :url, 'Provider URL:'
- = form.text_field :url, :title => 'provider_url', :value => @provider.url, :class => 'long'
+ = form.label :url, t('providers.form.provider_url')
+ = form.text_field :url, :title => t('providers.form.provider_url'), :value => @provider.url, :class => 'long'
%p
- = form.label :provider_type, 'Provider type:'
- = form.select(:provider_type_id, ProviderType.all.collect {|provider_type| [provider_type.name,provider_type.id] }, :prompt => "Select type of provider")
+ = 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'))
%p
- = form.label :url, 'X-Deltacloud-Provider:'
- = form.text_field :deltacloud_provider, :title => 'deltacloud_provider', :value => @provider.deltacloud_provider, :class => 'long'
+ = 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'
diff --git a/src/app/views/providers/_properties.html.haml b/src/app/views/providers/_properties.html.haml
index ee8a768..1280666 100644
--- a/src/app/views/providers/_properties.html.haml
+++ b/src/app/views/providers/_properties.html.haml
@@ -2,32 +2,32 @@
%thead
%tr
%th.show
- Properties for
+ =t("catalog_entries.properties.properties_for")
= @provider.name
%th.show
%tbody
%tr
%td
- %label Provider name
+ %label= t("providers.index.provider_name")
%td
= @provider.name
%tr
%td
- %label Provider URL
+ %label= t("providers.index.provider_url")
%td
= @provider.url
%tr
%td
- %label Provider Type
+ %label= t("providers.index.provider_type")
%td
= @provider.provider_type.name
%tr
%td
- %label X-Deltacloud-Driver
+ %label= t("providers.index.x_deltacloud_driver")
%td
= @provider.provider_type.deltacloud_driver
%tr
%td
- %label X-Deltacloud-Provider
+ %label= t("providers.index.x_deltacloud_provider")
%td
= @provider.deltacloud_provider
diff --git a/src/app/views/providers/_section_header.html.haml b/src/app/views/providers/_section_header.html.haml
index a513407..8c59da3 100644
--- a/src/app/views/providers/_section_header.html.haml
+++ b/src/app/views/providers/_section_header.html.haml
@@ -1,15 +1,15 @@
%header.admin-page-header
- %h1{:class => @provider.enabled ? 'enabled' : 'disabled'}= @provider.name.blank? ? "Editing Provider" : @provider.name
+ %h1{:class => @provider.enabled ? 'enabled' : 'disabled'}= @provider.name.blank? ? t("providers.editing_provider") : @provider.name
#obj_actions
- %span.label.light Choose a provider:
+ %span.label.light= t("providers.choose_a_provider")
%ul#provider_select
%li
- = link_to @provider.name.blank? ? "Editing Provider" : @provider.name, "javascript:void(0)"
+ = link_to @provider.name.blank? ? t("providers.editing_provider") : @provider.name, "javascript:void(0)"
%ul
- %li= link_to "+ Create New Provider", new_provider_path, :id => "create_new_provider"
+ %li= link_to "+" + t("providers.index.create_new_provider"), new_provider_path, :id => "create_new_provider"
- @providers.each do |provider|
%li= link_to provider.name, edit_provider_path(provider)
= form_for @provider, :url => provider_path(@provider), :html => { :method => :put, :class => 'generic' } do |f|
= f.hidden_field :enabled, :value => !(a)provider.enabled
- = f.submit "", :confirm => "#{(a)provider.enabled ? "Disable provider? All it's instances will be stopped!" : 'Enable provider?'}", :class => "provider_toggle #{(a)provider.enabled ? "on" : "off"}"
+ = f.submit "", :confirm => "#{(a)provider.enabled ? t("providers.disable_provider") : t("providers.enable_provider")}", :class => "provider_toggle #{(a)provider.enabled ? "on" : "off"}"
diff --git a/src/app/views/providers/edit.html.haml b/src/app/views/providers/edit.html.haml
index a1590eb..de14d1f 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -4,22 +4,19 @@
- unless @provider.enabled
%section.admin-content-section
%header.align-center
- %h2.disabled Provider is disabled.
+ %h2.disabled= t('providers.form.provider_id_disabled')
%p.align-center
- The provider "
- = @provider.name
- " is currently
- %strong disabled.
- To enable and configure provider, click the slide switch in the upper-right-hand corner of this window.
+ = t("providers.edit.provider_disabled", :name => @provider.name)
+ = t("providers.edit.enable_configure_providers")
= image_tag "provider_enable_hint.png"
%section.admin-content-section.alerts
%header
%h2.alerts
- Alerts
+ = t("alerts_label")
%span.label.badge.count.alert= @alerts.count
.section-controls
- = link_to "Toggle Alerts", "#", :class => 'collapse alerts' unless @alerts.blank?
+ = link_to t("providers.edit.toggle_alerts"), "#", :class => 'collapse alerts' unless @alerts.blank?
- unless @alerts.blank?
.content.collapsible
%dl.alerts
@@ -37,7 +34,7 @@
/ unimplemented
%section.admin-content-section
%header#tab-container-1
- %h2.settings Settings
+ %h2.settings= t("settings.settings")
%nav.faceted
%ul#tab-container-1-nav
- @tabs.each do |tab|
diff --git a/src/app/views/providers/index.html.haml b/src/app/views/providers/index.html.haml
index 1b2f482..fe749df 100644
--- a/src/app/views/providers/index.html.haml
+++ b/src/app/views/providers/index.html.haml
@@ -1,4 +1,4 @@
= render :partial => 'layouts/admin_nav'
%section.admin-content-section.provider
- No providers available. Please create one first.
- = link_to "Create New Provider", new_provider_path, :class => 'button', :id => "create_new_provider"
+ = t("providers.index.no_providers_available")
+ = link_to t("providers.index.create_new_provider"), new_provider_path, :class => 'button', :id => "create_new_provider"
\ No newline at end of file
diff --git a/src/app/views/providers/new.html.haml b/src/app/views/providers/new.html.haml
index 48baf5c..290100d 100644
--- a/src/app/views/providers/new.html.haml
+++ b/src/app/views/providers/new.html.haml
@@ -1,21 +1,21 @@
= render :partial => 'layouts/admin_nav'
%header.admin-page-header
- %h1= @provider.name.blank? ? "New Provider" : @provider.name
+ %h1= @provider.name.blank? ? t("providers.new.new_provider") : @provider.name
#obj_actions
%span.label.light Choose a provider:
%ul#provider_select
%li
- = link_to "Create New Provider", "javascript:void(0)"
+ = link_to t("providers.index.create_new_provider"), "javascript:void(0)"
%ul
- %li= link_to "+ Create New Provider", new_provider_path, :id => "create_new_provider"
+ %li= link_to "+ " + t("providers.index.create_new_provider"), new_provider_path, :id => "create_new_provider"
- @providers.each do |provider|
%li= link_to provider.name, edit_provider_path(provider)
%section.admin-content-section.users
%header
- %h2.settings Settings
+ %h2.settings= t("settings.settings")
.content
= form_for @provider, :url => providers_path, :html => {:class => 'generic'} do |f|
= render :partial => "form", :locals => { :form => f, :cancel_path => providers_path }
%fieldset.options
- = f.submit "Save Provider", :class => "submit button pill", :id => 'save'
+ = f.submit t("providers.new.save_provider"), :class => "submit button pill", :id => 'save'
diff --git a/src/app/views/providers/show.html.haml b/src/app/views/providers/show.html.haml
index 797c43a..2a9896e 100644
--- a/src/app/views/providers/show.html.haml
+++ b/src/app/views/providers/show.html.haml
@@ -3,7 +3,7 @@
%section.admin-content-section.provider
%header
- %h2 Properties
+ %h2= t("properties")
.content
%div#view
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 811d4a4..86b1cec 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -143,6 +143,12 @@ en:
quota_used: Quota Used
return_to: Return to
properties: Properties
+ hw_profiles: HW Profiles
+ services: Services
+ history: History
+ realm_s: Realms
+ connectivity: Connectivity
+ accounts: Accounts
catalog_images: Catalog Images
quota: Quota
deployments:
@@ -577,6 +583,10 @@ en:
provider: Provider
providers: Providers
confirm_delete: "Are you sure you want to delete this provider?"
+ editing_provider: Editing Provider
+ choose_a_provider: "Choose a provider:"
+ disable_provider: "Disable provider? All it's instances will be stopped!"
+ enable_provider: "Enable provider?"
index:
provider_name: Provider Name
provider_url: Provider URL
@@ -584,9 +594,22 @@ en:
x_deltacloud_driver: X-Deltacloud-Driver
x_deltacloud_provider: X-Deltacloud-Provider
deleted: "Provider has been successfully deleted."
+ no_providers_available: No providers available. Please create one first.
+ create_new_provider: "Create New Provider"
+ new:
+ new_provider: New Provider
+ save_provider: Save Provider
+ edit:
+ provider_id_disabled: "Provider is disabled."
+ toggle_alerts: Toggle Alerts
+ provider_disabled: "The provider %{name} is currently disabled."
+ enable_configure_providers: "To enable and configure provider, click the slide switch in the upper-right-hand corner of this window."
form:
- provider_name: Provider Name
- provider_url: Provider URL
+ x_deltacloud_provider: "X-Deltacloud-Provider:"
+ provider_name: "Provider Name:"
+ provider_url: "Provider URL:"
+ provider_type: "Provider Type:"
+ select_type_of_provider: Select type of provider
caution_alt_text: Caution
enter_correct_url_msg: Please enter a correct URL format.
test_connection: Test Connection
--
1.7.6.4
12 years, 6 months
[PATCH conductor] Move config server strings to the i18n dictionary
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
https://www.aeolusproject.org/redmine/issues/2610
---
src/app/controllers/config_servers_controller.rb | 14 +++++++-------
.../views/config_servers/_config_server_form.haml | 10 +++++-----
src/app/views/config_servers/_section_header.haml | 2 +-
src/app/views/config_servers/edit.haml | 2 +-
src/app/views/config_servers/new.haml | 2 +-
src/config/locales/en.yml | 20 +++++++++++++++++++-
6 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/config_servers_controller.rb b/src/app/controllers/config_servers_controller.rb
index 03fc28f..63c1667 100644
--- a/src/app/controllers/config_servers_controller.rb
+++ b/src/app/controllers/config_servers_controller.rb
@@ -25,7 +25,7 @@ class ConfigServersController < ApplicationController
if not config_server.connection_valid?
flash[:error] = config_server.connection_error_msg
else
- flash[:notice] = "Test successful"
+ flash[:notice] = t('config_servers.flash.notice.test_successful')
end
provider_account = config_server.provider_account
provider = provider_account.provider
@@ -41,11 +41,11 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.new(params[:config_server])
@config_server.provider_account = @provider_account
if @config_server.invalid?
- flash[:error] = "The config server information is invalid."
+ flash[:error] = t('config_servers.flash.error.invalid')
render :action => 'new' and return
end
@config_server.save!
- flash[:notice] = "Config server added."
+ flash[:notice] = t('config_server.flash.notice.added')
redirect_to provider_provider_account_path((a)provider_account.provider, @provider_account)
end
@@ -55,10 +55,10 @@ class ConfigServersController < ApplicationController
require_privilege(Privilege::MODIFY, @provider_account)
if @config_server.update_attributes(params[:config_server])
- flash[:notice] = "Config server updated."
+ flash[:notice] = t('config_server.flash.notice.updated')
redirect_to provider_provider_account_path((a)provider_account.provider, @provider_account)
else
- flash[:error] = "Config server was not updated"
+ flash[:error] = t('config_servers.flash.error.not_updated')
render :action => :edit
end
end
@@ -67,9 +67,9 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.find(params[:id])
require_privilege(Privilege::MODIFY, @config_server.provider_account)
if ConfigServer.destroy(params[:id])
- flash[:notice] = "Config server was deleted."
+ flash[:notice] = t('config_server.flash.notice.deleted')
else
- flash[:error] = "Config server was not deleted"
+ flash[:error] = t('config_servers.flash.error.not_deleted')
end
provider_account = @config_server.provider_account
provider = provider_account.provider
diff --git a/src/app/views/config_servers/_config_server_form.haml b/src/app/views/config_servers/_config_server_form.haml
index 4896778..ebbd1f4 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -3,19 +3,19 @@
%fieldset
%p
= hidden_field_tag "provider_account_id", @provider_account.id
- = form.label :host
+ = form.label :host, t('.host')
= form.text_field :host, :class => 'em long'
%p
- = form.label :port
+ = form.label :port, t('.port')
= form.text_field :port
%p
- = form.label :username
+ = form.label :username, t('.username')
= form.text_field :username
%p
- = form.label :password
+ = form.label :password, t('.password')
= password_field_tag "config_server[password]", @config_server.password
%p
- = form.label :certificate
+ = form.label :certificate, t('.certificate')
%div.help
= t('config_servers.certificate_help')
= form.text_area :certificate, :rows => 20, :cols => 64
diff --git a/src/app/views/config_servers/_section_header.haml b/src/app/views/config_servers/_section_header.haml
index d8e75fe..bdf4b48 100644
--- a/src/app/views/config_servers/_section_header.haml
+++ b/src/app/views/config_servers/_section_header.haml
@@ -1,3 +1,3 @@
%header.page-header
- %h1{:class => controller.controller_name} Config Server
+ %h1{:class => controller.controller_name}= t('.config_server')
.corner
diff --git a/src/app/views/config_servers/edit.haml b/src/app/views/config_servers/edit.haml
index 07b3abe..b0586a6 100644
--- a/src/app/views/config_servers/edit.haml
+++ b/src/app/views/config_servers/edit.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 Edit Config Server
+ %h2= t('.edit_config_server')
.content
= form_for @config_server, :url => config_server_path(@config_server), :html => {:method => :put, :class => "generic"} do |f|
diff --git a/src/app/views/config_servers/new.haml b/src/app/views/config_servers/new.haml
index 9ea48b2..8495f73 100644
--- a/src/app/views/config_servers/new.haml
+++ b/src/app/views/config_servers/new.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 New Config Server
+ %h2= t('.new_config_server')
.content
= form_for @config_server, :url => config_servers_path, :html => {:class => "generic"} do |f|
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 811d4a4..d11d480 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -669,10 +669,28 @@ en:
must_select_account: "You must select some accounts first."
config_servers:
certificate_help: Provide a certificate to enable https support
+ section_header:
+ config_server: Config Server
new:
new_config_server: New Config Server
edit:
edit_config_server: Edit Config Server
+ config_server_form:
+ host: Host
+ port: Port
+ username: Username
+ password: Password
+ certificate: Certificate
+ flash:
+ notice:
+ test_successful: Test successful
+ added: Config server added.
+ updated: Config server updated.
+ deleted: Config server was deleted.
+ error:
+ invalid: The config server information is invalid.
+ not_updated: Config server was not updated
+ not_deleted: Config server was not deleted
errors:
connection:
generic: "Could not validate config server connection (url: %{url}). Check the connection parameters and try again."
@@ -755,4 +773,4 @@ en:
admin_tabs:
catalogs: Catalogs
realms: Realms
- hardware: Hardware
\ No newline at end of file
+ hardware: Hardware
--
1.7.6.4
12 years, 6 months
[PATCH conductor 1/2] Permissions UI for site-wide grants.
by Scott Seago
---
src/app/controllers/application_controller.rb | 10 +++++++
src/app/controllers/permissions_controller.rb | 37 ++++++++++++++++---------
src/app/controllers/users_controller.rb | 1 +
src/app/views/permissions/_form.html.haml | 5 +---
src/app/views/permissions/_new.html.haml | 4 +-
src/app/views/permissions/index.html.haml | 6 +++-
src/app/views/permissions/list.html.haml | 34 +++--------------------
src/app/views/permissions/new.html.haml | 2 +
src/app/views/users/index.html.haml | 22 +--------------
src/config/navigation.rb | 2 +-
10 files changed, 51 insertions(+), 72 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 0ad58a9..049c227 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -250,6 +250,16 @@ class ApplicationController < ActionController::Base
end
end
+ def set_admin_users_tabs(tab)
+ @tabs = [{:name => 'Users', :url => users_url, :id => 'catalogs'},
+ #{:name => 'Groups', :url => groups_url, :id => 'groups'},
+ {:name => 'Global Role Grants', :url => permissions_url, :id => 'permissions'},
+ ]
+ unless @details_tab = @tabs.find {|t| t[:id] == tab}
+ raise "Tab '#{tab}' doesn't exist"
+ end
+ end
+
def sort_column(model, default="name")
model.column_names.include?(params[:order_field]) ? params[:order_field] : default
end
diff --git a/src/app/controllers/permissions_controller.rb b/src/app/controllers/permissions_controller.rb
index 267788b..7a9a5a4 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -22,10 +22,11 @@ class PermissionsController < ApplicationController
def index
set_permission_object(Privilege::PERM_VIEW)
+ @roles = Role.find_all_by_scope((a)permission_object.class.name)
respond_to do |format|
format.html
format.json { render :json => @permission_object.as_json }
- format.js { render :partial => 'index' }
+ format.js { render :partial => 'permissions' }
end
end
@@ -33,6 +34,13 @@ class PermissionsController < ApplicationController
set_permission_object
@users = User.all
@roles = Role.find_all_by_scope((a)permission_object.class.name)
+ if @permission_object == BasePermissionObject.general_permission_scope
+ @return_text = "Global Role Grants"
+ @summary_text = "Choose global role assignments for users"
+ else
+ @return_text = "#{(a)permission_object.name} #{(a)permission_object.class}"
+ @summary_text = "Choose roles for users you would like to grant access to this #{(a)permission_object.class}"
+ end
load_headers
load_users
respond_to do |format|
@@ -68,10 +76,7 @@ class PermissionsController < ApplicationController
flash[:error] = t "permissions.flash.error.no_users_selected"
end
respond_to do |format|
- format.html { redirect_to send("#{@path_prefix}polymorphic_path",
- @permission_object,
- :details_tab => :permissions,
- :only_tab => true) }
+ format.html { redirect_to @return_path }
format.js { render :partial => 'index',
:permission_object_type => @permission_object.class.name,
:permission_object_id => @permission_object.id }
@@ -108,10 +113,7 @@ class PermissionsController < ApplicationController
flash[:error] = t"permissions.flash.error.no_users_selected"
end
respond_to do |format|
- format.html { redirect_to send("#{@path_prefix}polymorphic_path",
- @permission_object,
- :details_tab => :permissions,
- :only_tab => true) }
+ format.html { redirect_to @return_path }
format.js { render :partial => 'index',
:permission_object_type => @permission_object.class.name,
:permission_object_id => @permission_object.id }
@@ -138,10 +140,7 @@ class PermissionsController < ApplicationController
flash[:error] = "#{t('permissions.flash.error.not_deleted')}: #{not_deleted.join(', ')}"
end
respond_to do |format|
- format.html { redirect_to send("#{@path_prefix}polymorphic_path",
- @permission_object,
- :details_tab => :permissions,
- :only_tab => true) }
+ format.html { redirect_to @return_path }
format.js { render :partial => 'index',
:permission_object_type => @permission_object.class.name,
:permission_object_id => @permission_object.id }
@@ -181,8 +180,20 @@ class PermissionsController < ApplicationController
obj_type = params[:permission_object_type]
id = params[:permission_object_id]
@path_prefix = params[:path_prefix]
+ unless obj_type or id
+ @permission_object = BasePermissionObject.general_permission_scope
+ end
@permission_object = obj_type.constantize.find(id) if obj_type and id
raise RuntimeError, "invalid permission object" if @permission_object.nil?
+ if @permission_object == BasePermissionObject.general_permission_scope
+ @return_path = permissions_path
+ set_admin_users_tabs 'permissions'
+ else
+ @return_path = send("#{@path_prefix}polymorphic_path",
+ @permission_object,
+ :details_tab => :permissions,
+ :only_tab => true)
+ end
require_privilege(required_role, @permission_object)
end
end
diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index d634c88..23afdce 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -24,6 +24,7 @@ class UsersController < ApplicationController
require_privilege(Privilege::VIEW, User)
clear_breadcrumbs
save_breadcrumb(users_path)
+ set_admin_users_tabs 'catalogs'
@params = params
load_headers
load_users
diff --git a/src/app/views/permissions/_form.html.haml b/src/app/views/permissions/_form.html.haml
index b1b6ed4..b6be8ae 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -2,10 +2,7 @@
= hidden_field_tag :permission_object_type, @permission_object.class.name
= hidden_field_tag :permission_object_id, @permission_object.id
= hidden_field_tag :path_prefix, @path_prefix
- = link_to 'Cancel', send("#{@path_prefix}polymorphic_path",
- @permission_object,
- :details_tab => :permissions,
- :only_tab => true), :class => 'button danger'
+ = link_to 'Cancel', @return_path, :class => 'button danger'
= restful_submit_tag "Grant Access", "create", permissions_path, 'POST', :id => 'save_button'
= filter_table(@header, @users) do |user|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/permissions/_new.html.haml b/src/app/views/permissions/_new.html.haml
index a314b51..2198a6a 100644
--- a/src/app/views/permissions/_new.html.haml
+++ b/src/app/views/permissions/_new.html.haml
@@ -2,11 +2,11 @@
%h1{:class => controller.controller_name} Grant Access
#obj_actions.button-group
Return to
- = link_to "#{(a)permission_object.name} #{(a)permission_object.class}", send("#{@path_prefix}polymorphic_path", @permission_object, :details_tab => :permissions, :only_tab => true), :class => 'button primary', :id => 'new_pool_button'
+ = link_to @return_text, @return_path, :class => 'button primary', :id => 'new_pool_button'
.corner
%section.content-section.pools
- Choose roles for users you would like to grant access to this #{(a)permission_object.class}
+ = @summary_text
%header
%h2 Users
diff --git a/src/app/views/permissions/index.html.haml b/src/app/views/permissions/index.html.haml
index 229236b..544986c 100644
--- a/src/app/views/permissions/index.html.haml
+++ b/src/app/views/permissions/index.html.haml
@@ -1 +1,5 @@
-= render :partial => 'permissions'
+- if @permission_object == BasePermissionObject.general_permission_scope
+ = render :partial => 'layouts/admin_nav'
+ = render :partial => 'layouts/admin_users_tabs'
+- else
+ = render :partial => 'permissions'
diff --git a/src/app/views/permissions/list.html.haml b/src/app/views/permissions/list.html.haml
index 859527a..544986c 100644
--- a/src/app/views/permissions/list.html.haml
+++ b/src/app/views/permissions/list.html.haml
@@ -1,31 +1,5 @@
-- if @permission_object.permissions.size == 0
- %h1
- There are no permissions defined on #{(a)permission_object.name}
+- if @permission_object == BasePermissionObject.general_permission_scope
+ = render :partial => 'layouts/admin_nav'
+ = render :partial => 'layouts/admin_users_tabs'
- else
- %table
- %thead
- %tr
- %th{:scope => "col"} User
- %th{:scope => "col"} Role
- %th{:scope => "col"} Action
- %tbody
- - @permission_object.permissions.each {|permission|
- %tr
- %td= permission.user.login
- %td= permission.role.name
- %td
- - if check_privilege(Privilege::PERM_SET)
- = form_tag :action => 'destroy' do
- = hidden_field :permission, :id, :value => permission.id
- = submit_tag "delete", :class => "submit_link", :id => "delete_#{permission.id}"
- - }
-= link_to "Add a user", |
- {:controller => "users", |
- :action => "new"}, |
- :class=>"actionlink" if check_privilege(Privilege::CREATE,User,BasePermissionObject.general_permission_scope) |
--#
-= link_to "Add a new permission record", |
- {:action => "new", |
- :permission_object_type => @permission_object.class, |
- :permission_object_id => @permission_object.id}, |
- :class=>"actionlink" if check_privilege(Privilege::PERM_SET) |
+ = render :partial => 'permissions'
diff --git a/src/app/views/permissions/new.html.haml b/src/app/views/permissions/new.html.haml
index b40557d..8a73c70 100644
--- a/src/app/views/permissions/new.html.haml
+++ b/src/app/views/permissions/new.html.haml
@@ -1 +1,3 @@
+- if @permission_object == BasePermissionObject.general_permission_scope
+ = render :partial => 'layouts/admin_nav'
= render :partial => 'new'
diff --git a/src/app/views/users/index.html.haml b/src/app/views/users/index.html.haml
index e23dd63..7cc23db 100644
--- a/src/app/views/users/index.html.haml
+++ b/src/app/views/users/index.html.haml
@@ -1,22 +1,2 @@
= render :partial => 'layouts/admin_nav'
-%header.admin-page-header
- #obj_actions
- =t'users.quick_jump'
- /= link_to 'Groups', "#groups", :class => 'rounded-link'
- = link_to "#{t'users.users'}", "#users", :class => 'rounded-link'
- /= link_to 'Roles', "#roles", :class => 'rounded-link'
- .clear
-/%section.admin-content-section
-/ %header
-/ %h2#groups.groups Groups
-/ .section-controls
-/ #obj_actions
-/ = link_to "", "#", :class => 'add-group-button', :id => 'add_group_button'
-/ .content
-/ Unimplemented.
-= render :partial => 'list'
-/%section.admin-content-section
-/ %header
-/ %h2#roles.roles Roles
-/ .content
-/ Unimplemented.
+= render :partial => 'layouts/admin_users_tabs'
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
index cbbc5a6..12400d8 100644
--- a/src/config/navigation.rb
+++ b/src/config/navigation.rb
@@ -22,7 +22,7 @@ SimpleNavigation::Configuration.run do |navigation|
first_level.dom_class = 'container'
first_level.item :monitor, t('navigation.first_level.monitor'), pools_path, :class => 'monitor', :link => { :id => 'monitor' }, :highlights_on => /\/deployments|\/pools|\/instances|\/\z/
first_level.item :administer, t('navigation.first_level.administer'), users_path, :class => 'administer' do |second_level|
- second_level.item :users_and_groups, t('navigation.second_level.users_groups'), users_path, :link => { :class => 'users' }, :highlights_on => /\/users|\/roles|\/account/
+ second_level.item :users_and_groups, t('navigation.second_level.users_groups'), users_path, :link => { :class => 'users' }, :highlights_on => /\/users|\/roles|\/permissions|\/account/
second_level.item :environments, t('navigation.second_level.environments'), pool_families_path, :link => { :class => 'environments' }, :highlights_on => /\/pool_families/
second_level.item :content, t('navigation.second_level.content'), catalogs_path, :link => { :class => 'content' }, :highlights_on => /\/catalogs|\/catalog_entries|\/realms|\/hardware_profiles|\/realm_mappings/
second_level.item :cloud_providers, t('navigation.second_level.cloud_providers'), providers_path, :link => { :class => 'providers' }, :highlights_on => /\/providers/
--
1.7.6.4
12 years, 6 months