On 10/20/2011 03:15 PM, Jirka Tomasek wrote:
---
src/app/controllers/providers_controller.rb | 10 ++++++----
src/app/views/provider_accounts/_list.html.haml | 2 +-
src/app/views/providers/edit.html.haml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 2ffce4c..09ee13d 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -181,21 +181,23 @@ class ProvidersController< ApplicationController
unless provider_account.quota.maximum_running_instances == nil
if provider_account.quota.maximum_running_instances<
provider_account.quota.running_instances
alerts<< {
- :type => "#{t'providers.alerts.type.critical'}",
+ :class => "critical",
:subject => "#{t'providers.alerts.subject.quota'}",
:alert_type =>
"#{t'providers.alerts.alert_type.quota_exceeded'}",
:path =>
edit_provider_provider_account_path(@provider,provider_account),
- :description =>
"#{t'providers.alerts.description.quota_exceeded', :name =>
"#{provider_account.name}"}"
+ :description =>
"#{t'providers.alerts.description.quota_exceeded', :name =>
"#{provider_account.name}"}",
+ :account_id => provider_account.id
}
end
if (70..100) === provider_account.quota.percentage_used.round
alerts<< {
- :type => "#{t'providers.alerts.type.warning'}",
+ :class => "warning",
:subject => "#{t'providers.alerts.subject.quota'}",
:alert_type => "#{provider_account.quota.percentage_used.round}%
#{t'providers.alerts.alert_type.quota_reached'}",
:path => provider_provider_account_path(@provider,provider_account),
- :description => "#{provider_account.quota.percentage_used.round}%
#{t'providers.alerts.description.quota_reached', :name =>
"#{provider_account.name}" }"
+ :description => "#{provider_account.quota.percentage_used.round}%
#{t'providers.alerts.description.quota_reached', :name =>
"#{provider_account.name}" }",
+ :account_id => provider_account.id
}
end
end
diff --git a/src/app/views/provider_accounts/_list.html.haml
b/src/app/views/provider_accounts/_list.html.haml
index 1365f38..153eded 100644
--- a/src/app/views/provider_accounts/_list.html.haml
+++ b/src/app/views/provider_accounts/_list.html.haml
@@ -8,7 +8,7 @@
%td{:class => 'checkbox'}
- selected = params[:select] == 'all'
= check_box_tag "accounts_selected[]", account.id, selected, :id
=> "account_checkbox_#{account.id}"
- %td{:class => 'alert'}= #image_tag
"sb_icon_instance_failure.png"
+ %td{:class => 'alert'}= image_tag
"sb_icon_instance_failure.png" unless @alerts.select {|alert| alert[:account_id]
== account.id }.empty?
%td= link_to account.name, provider_provider_account_path(@provider, account)
%td= account.credentials_hash['username']
%td= account.provider.name
diff --git a/src/app/views/providers/edit.html.haml
b/src/app/views/providers/edit.html.haml
index c5e2c59..a1590eb 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -26,7 +26,7 @@
%ul
- @alerts.each do |alert|
%li.alert
- %dt.subject{ :class => alert[:type] }= alert[:subject]
+ %dt.subject{ :class => alert[:class] }= alert[:subject]
%dd.type= link_to alert[:alert_type], alert[:path]
%dd.desc= alert[:description]
/%section.admin-content-section.provider
ACK
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.