[PATCH 7/8] RM 3145 updates reflecting new state attribute for deployments

Tzu-Mainn Chen tzumainn at redhat.com
Wed May 9 01:02:36 UTC 2012


---
 src/app/controllers/logs_controller.rb |    5 ++---
 src/app/models/deployment.rb           |    5 +++++
 src/app/views/logs/index.html.haml     |    3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/controllers/logs_controller.rb b/src/app/controllers/logs_controller.rb
index d8b7325..39b1421 100644
--- a/src/app/controllers/logs_controller.rb
+++ b/src/app/controllers/logs_controller.rb
@@ -69,8 +69,7 @@ class LogsController < ApplicationController
 
       # filter by state
       if @state.present?
-        event_state = (source_class == "Deployment" ? event.source.status.to_s : event.source.state)
-        next if event_state != @state
+        next if event.source.state != @state
       end
 
       # filter by pool
@@ -95,7 +94,7 @@ class LogsController < ApplicationController
 
   def load_options
     @source_type_options = [[t('logs.options.default_event_types'), ""], t('logs.options.deployment_event_type'), t('logs.options.instance_event_type')]
-    @state_options = [[t('logs.options.default_states'), ""]] + Instance::STATES
+    @state_options = ([[t('logs.options.default_states'), ""]] + Deployment::STATES + Instance::STATES).uniq
     @pool_options = [[t('logs.options.default_pools'), ""]]
     PoolFamily.list_for_user(current_user, Privilege::VIEW).find(:all, :include => :pools, :order => "name", :select => ["id", "name"]).each do |pool_family|
       @pool_options << [pool_family.name, "pool_family:" + pool_family.id.to_s]
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index ecd857c..1424810 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -88,6 +88,11 @@ class Deployment < ActiveRecord::Base
   STATE_ROLLBACK_COMPLETE    = "rollback_complete"
   STATE_ROLLBACK_FAILED      = "rollback_failed"
 
+  STATES = [STATE_NEW, STATE_PENDING, STATE_RUNNING, STATE_INCOMPLETE,
+            STATE_SHUTTING_DOWN, STATE_STOPPED, STATE_FAILED,
+            STATE_ROLLBACK_IN_PROGRESS, STATE_ROLLBACK_COMPLETE,
+            STATE_ROLLBACK_FAILED]
+
   validate :validate_xml
   validate :validate_launch_parameters
 
diff --git a/src/app/views/logs/index.html.haml b/src/app/views/logs/index.html.haml
index f1df042..b76d620 100644
--- a/src/app/views/logs/index.html.haml
+++ b/src/app/views/logs/index.html.haml
@@ -20,11 +20,10 @@
     = filter_table(@header, @paginated_events) do |event|
       - source = event.source
       - provider_account = source.nil? ? nil : source.provider_account
-      - state = source.nil? ? nil : (source.class.name == "Deployment" ? source.status : source.state)
       %tr{:class => cycle('nostripe','stripe')}
         %td= event.event_time.strftime("%d-%b-%Y %H:%M:%S")
         %td= source.nil? ? t('logs.index.not_available') : source.name
-        %td= source.nil? ? t('logs.index.not_available') : state
+        %td= source.nil? ? t('logs.index.not_available') : source.state
         %td= source.nil? ? t('logs.index.not_available') : source.pool_family.name + "/" + source.pool.name
         %td= provider_account.nil? ? t('logs.index.not_available') : provider_account.provider.name + "/" + provider_account.name
         %td= source.nil? ? t('logs.index.not_available') : source.owner.login
-- 
1.7.6.5




More information about the aeolus-devel mailing list