From d0dab2498fd6575b2dbb6641fdbd9ccbcb6fe3a6 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Tue, 8 Jan 2019 10:36:11 -0500 Subject: [PATCH 1/3] total doesn't need to be stored in then deleted from the states hash --- app/models/miq_request.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/miq_request.rb b/app/models/miq_request.rb index df5cc68c48c..3308f936e9b 100644 --- a/app/models/miq_request.rb +++ b/app/models/miq_request.rb @@ -368,14 +368,14 @@ def set_description(force = false) def update_request_status states = Hash.new { |h, k| h[k] = 0 } status = Hash.new { |h, k| h[k] = 0 } + total = 0 task_count = miq_request_tasks.count miq_request_tasks.each do |p| states[p.state] += 1 - states[:total] += 1 status[p.status] += 1 + total += 1 end - total = states.delete(:total).to_i unknown_state = task_count - total states["unknown"] = unknown_state unless unknown_state.zero? msg = states.sort.collect { |s| "#{s[0].capitalize} = #{s[1]}" }.join("; ") From 00962f8e3e63a5e23a89b188a6899fb7711efb44 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Tue, 8 Jan 2019 10:39:44 -0500 Subject: [PATCH 2/3] I don't see how this could be non-zero --- app/models/miq_request.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/miq_request.rb b/app/models/miq_request.rb index 3308f936e9b..5df6aa3be65 100644 --- a/app/models/miq_request.rb +++ b/app/models/miq_request.rb @@ -376,8 +376,6 @@ def update_request_status status[p.status] += 1 total += 1 end - unknown_state = task_count - total - states["unknown"] = unknown_state unless unknown_state.zero? msg = states.sort.collect { |s| "#{s[0].capitalize} = #{s[1]}" }.join("; ") req_state = (states.length == 1) ? states.keys.first : "active" From f7e786f41178e0a5417c7132984ab7ead7767a47 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Tue, 8 Jan 2019 10:40:44 -0500 Subject: [PATCH 3/3] total is no longer used --- app/models/miq_request.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/miq_request.rb b/app/models/miq_request.rb index 5df6aa3be65..af56a64c7d4 100644 --- a/app/models/miq_request.rb +++ b/app/models/miq_request.rb @@ -368,13 +368,11 @@ def set_description(force = false) def update_request_status states = Hash.new { |h, k| h[k] = 0 } status = Hash.new { |h, k| h[k] = 0 } - total = 0 task_count = miq_request_tasks.count miq_request_tasks.each do |p| states[p.state] += 1 status[p.status] += 1 - total += 1 end msg = states.sort.collect { |s| "#{s[0].capitalize} = #{s[1]}" }.join("; ")