---
src/app/controllers/logs_controller.rb | 68 +++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/app/controllers/logs_controller.rb
b/src/app/controllers/logs_controller.rb
index 39b1421..8b9e5c4 100644
--- a/src/app/controllers/logs_controller.rb
+++ b/src/app/controllers/logs_controller.rb
@@ -30,7 +30,11 @@ class LogsController < ApplicationController
end
def filter
- redirect_to_original({"source_type" => params[:source_type],
"pool_select" => params[:pool_select], "provider_select" =>
params[:provider_select], "owner_id" => params[:owner_id], "state"
=> params[:state]})
+ redirect_to_original({"source_type" => params[:source_type],
+ "pool_select" => params[:pool_select],
+ "provider_select" => params[:provider_select],
+ "owner_id" => params[:owner_id],
+ "state" => params[:state]})
end
protected
@@ -38,7 +42,8 @@ class LogsController < ApplicationController
def load_logs
@source_type = params[:source_type].nil? ? "" : params[:source_type]
@pool_select = params[:pool_select].nil? ? "" : params[:pool_select]
- @provider_select = params[:provider_select].nil? ? "" :
params[:provider_select]
+ @provider_select =
+ params[:provider_select].nil? ? "" : params[:provider_select]
@owner_id = params[:owner_id].nil? ? "" : params[:owner_id]
@state = params[:state].nil? ? "" : params[:state]
@@ -48,42 +53,48 @@ class LogsController < ApplicationController
end
@events = Event.unscoped.find(:all,
- :include => {:source => [:pool_family, :pool,
:owner]},
- :conditions => conditions
- )
- deployments = Deployment.unscoped.list_for_user(current_user, Privilege::VIEW)
+ :include =>
+ {:source => [:pool_family, :pool, :owner]},
+ :conditions => conditions
+ )
+ deployments = Deployment.unscoped.list_for_user(current_user,
+ Privilege::VIEW)
instances = Instance.unscoped.list_for_user(current_user, Privilege::VIEW)
pool_option, pool_option_id = @pool_select.split(":")
provider_option, provider_option_id = @provider_select.split(":")
@events = @events.find_all{|event|
- source_class = event.source.class.name
+ source = event.source
+ source_class = source.class.name
# permission checks
- next if source_class == "Deployment" and
!deployments.include?(event.source)
- next if source_class == "Instance" and !instances.include?(event.source)
+ next if source_class == "Deployment" and !deployments.include?(source)
+ next if source_class == "Instance" and !instances.include?(source)
# filter by user
- next if @owner_id.present? && event.source.owner_id.to_s != @owner_id
+ next if @owner_id.present? && source.owner_id.to_s != @owner_id
# filter by state
if @state.present?
- next if event.source.state != @state
+ next if source.state != @state
end
# filter by pool
if @pool_select.present?
- next if pool_option == "pool_family" &&
event.source.pool_family_id.to_s != pool_option_id
- next if pool_option == "pool" && event.source.pool_id.to_s !=
pool_option_id
+ next if (pool_option == "pool_family" &&
+ source.pool_family_id.to_s != pool_option_id)
+ next if pool_option == "pool" && source.pool_id.to_s !=
pool_option_id
end
# filter by provider
if @provider_select.present?
- event_provider_account = event.source.provider_account
+ event_provider_account = source.provider_account
next if event_provider_account.nil?
- next if provider_option == "provider" &&
event.source.provider_account.provider.id.to_s != provider_option_id
- next if provider_option == "provider_account" &&
event.source.provider_account.id.to_s != provider_option_id
+ next if (provider_option == "provider" &&
+ source.provider_account.provider.id.to_s != provider_option_id)
+ next if (provider_option == "provider_account" &&
+ source.provider_account.id.to_s != provider_option_id)
end
true
@@ -93,19 +104,30 @@ class LogsController < ApplicationController
end
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'), ""]] +
Deployment::STATES + Instance::STATES).uniq
+ @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'), ""]] +
+ 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|
+ 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]
- @pool_options += pool_family.pools.map{|x| [" -- " + x.name,
"pool:" + x.id.to_s]}
+ @pool_options += pool_family.pools.
+ map{|x| [" -- " + x.name, "pool:" + x.id.to_s]}
end
@provider_options = [[t('logs.options.default_providers'), ""]]
- Provider.list_for_user(current_user, Privilege::VIEW).find(:all, :include =>
:provider_accounts, :order => "name", :select => ["id",
"name"]).each do |provider|
+ Provider.list_for_user(current_user, Privilege::VIEW).
+ find(:all, :include => :provider_accounts, :order => "name",
+ :select => ["id", "name"]).each do |provider|
@provider_options << [provider.name, "provider:" +
provider.id.to_s]
- @provider_options += provider.provider_accounts.map{|x| [" -- " + x.name,
"provider_account:" + x.id.to_s]}
+ @provider_options += provider.provider_accounts.
+ map{|x| [" -- " + x.name, "provider_account:" + x.id.to_s]}
end
- @owner_options = [[t('logs.options.default_users'), ""]] +
User.find(:all, :order => "login", :select => ["id",
"login"]).map{|x| [x.login, x.id]}
+ @owner_options = [[t('logs.options.default_users'), ""]] +
+ User.find(:all, :order => "login",
+ :select => ["id", "login"]).map{|x| [x.login,
x.id]}
end
def load_headers
--
1.7.6.5