move puppet specific methods to PuppetReport class

theforeman · Jul 8, 2015 · 537f01e · 537f01e
1 parent ebabb46
commit 537f01e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/app/models/puppet_report.rb b/app/models/puppet_report.rb
@@ -6,4 +6,15 @@ def self.model_name
   def self.import(report, proxy_id = nil)
     PuppetReportImporter.import(report, proxy_id)
   end
+
+  def summaryStatus
+    return _("Failed")   if error?
+    return _("Modified") if changes?
+    _("Success")
+  end
+
+  # puppet report status table column name
+  def self.report_status
+    "status"
+  end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
@@ -84,7 +84,7 @@ def runtime
 
   def self.import(report, proxy_id = nil)
     #raise NotImplementedError
-    Foreman::Deprecation.deprecation_warning(1.11, "Reports should be... ")
+    Foreman::Deprecation.deprecation_warning(1.12, "Reports should be... ")
     PuppetReportImporter.import(report, proxy_id)
   end
 
@@ -134,17 +134,6 @@ def self.expire(conditions = {})
   def no_report
     false
   end
-
-  def summaryStatus
-    return _("Failed")   if error?
-    return _("Modified") if changes?
-    _("Success")
-  end
-
-  # puppet report status table column name
-  def self.report_status
-    "status"
-  end
 end
 
 require_dependency 'puppet_report'

diff --git a/app/services/report_importer.rb b/app/services/report_importer.rb
@@ -10,7 +10,7 @@ def self.importers
     @importers ||= { :puppet => PuppetReportImporter }.with_indifferent_access
   end
 
-  def self.register_fact_importer(key, klass)
+  def self.register_report_importer(key, klass)
     importers[key.to_sym] = klass
   end