From bda92e2d34cf25f1e3b677a1a183a8c91b629e95 Mon Sep 17 00:00:00 2001
From: Tom McKay <thomasmckay@redhat.com>
Date: Wed, 28 Aug 2013 13:36:01 -0400
Subject: [PATCH] 999075-dist-events - fix bug and update method for updating
 distributor tasks

999075-dist-events - removed TaskStatus.refresh() call from distributor.rb since only applies to pulp

999075-dist-events - ...and removing the now-useless wrapper method in distributor.rb
---
 app/lib/navigation/content_menu.rb |  6 ------
 app/models/distributor.rb          |  4 +++-
 app/models/task_status.rb          | 13 -------------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/lib/navigation/content_menu.rb b/app/lib/navigation/content_menu.rb
index 2634adc7d29..ebbb0bcc8a5 100644
--- a/app/lib/navigation/content_menu.rb
+++ b/app/lib/navigation/content_menu.rb
@@ -472,12 +472,6 @@ def distributors_subnav
           :if => lambda{@distributor},
           :options => {:class=>"third_level panel_link"},
         },
-        { :key => :custom_info,
-          :name => _("Custom Information"),
-          :url => lambda{custom_info_system_path(@distributor.id)},
-          :if => lambda{@system},
-          :options => {:class => "third_level panel_link"}
-        },
         { :key => :custom_info,
           :name => _("Custom Information"),
           :url => lambda{custom_info_distributor_path(@distributor.id)},
diff --git a/app/models/distributor.rb b/app/models/distributor.rb
index e8b7548372f..93c4cefe9b3 100644
--- a/app/models/distributor.rb
+++ b/app/models/distributor.rb
@@ -92,7 +92,8 @@ def init_default_custom_info
   end
 
   def tasks
-    TaskStatus.refresh_for_distributor(self)
+    import_candlepin_tasks
+    self.task_statuses
   end
 
   # A rollback occurred while attempting to create the distributor; therefore, perform necessary cleanup.
@@ -104,6 +105,7 @@ def rollback_on_create
   end
 
   private
+
     def save_task_status pulp_task, task_type, parameters_type, parameters
       # TODO: remove entirely from distributor model, or need to keep as stub?
     end
diff --git a/app/models/task_status.rb b/app/models/task_status.rb
index fe6bcf8a290..62b809eb869 100644
--- a/app/models/task_status.rb
+++ b/app/models/task_status.rb
@@ -306,19 +306,6 @@ def rmi_error_description
 
   end
 
-  def self.refresh_for_system(system_id)
-    system = System.find(system_id)
-
-    return self.refresh_for_candlepin_consumer('System', system_id, system)
-  end
-
-  def self.refresh_for_distributor(distributor_id)
-    distributor = System.find(distributor_id)
-
-    return self.refresh_for_candlepin_consumer('Distributor', distributor_id, distributor)
-
-  end
-
   def self.refresh(ids)
     unless ids.blank?
       uuids = TaskStatus.where(:id=>ids).pluck(:uuid)