aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2015-05-06 08:44:47 +0200
committerLuc Donnet2015-05-06 08:44:47 +0200
commitc3260b107b3e17bc9a25b4bca69bd36ded585f24 (patch)
tree912d04699f9262cc844e2161c5e5a9632f13b2a1
parent48e749486a376e9abfd7056d2485e47d69d65660 (diff)
downloadchouette-core-c3260b107b3e17bc9a25b4bca69bd36ded585f24.tar.bz2
Fix model to return nil if path is not found
-rw-r--r--app/models/compliance_check.rb8
-rw-r--r--app/models/import.rb8
2 files changed, 8 insertions, 8 deletions
diff --git a/app/models/compliance_check.rb b/app/models/compliance_check.rb
index bf47d0248..f27dd7249 100644
--- a/app/models/compliance_check.rb
+++ b/app/models/compliance_check.rb
@@ -23,7 +23,7 @@ class ComplianceCheck
response = Ievkit.get(report_path)
ComplianceCheckReport.new(response)
else
- raise Ievkit::IevError("Impossible to access report path link for compliance check")
+ nil
end
end
@@ -33,7 +33,7 @@ class ComplianceCheck
response = Ievkit.get(report_path)
ComplianceCheckResult.new(response)
else
- raise Ievkit::IevError("Impossible to access report path link for validation")
+ nil
end
end
@@ -43,7 +43,7 @@ class ComplianceCheck
response = Ievkit.get(rule_parameter_set)
rule_parameter_set = RuleParameterSet.new.tap { |rps| rps.parameters = response.validation }
else
- raise Ievkit::Error("Impossible to access rule parameter set link for validation")
+ nil
end
end
@@ -56,7 +56,7 @@ class ComplianceCheck
elsif cancel_path
Ievkit.delete(cancel_path)
else
- raise Ievkit::Error("Impossible to access delete or cancel path link for compliance check")
+ nil
end
end
diff --git a/app/models/import.rb b/app/models/import.rb
index 963756d0a..b51a341b3 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -25,7 +25,7 @@ class Import
response = Ievkit.get(report_path)
ImportReport.new(response)
else
- raise Ievkit::IevError("Impossible to access report path link for import")
+ nil
end
end
@@ -34,7 +34,7 @@ class Import
if rule_parameter_set_path
::JSON.load( open(rule_parameter_set_path).read )
else
- false
+ nil
end
end
@@ -43,7 +43,7 @@ class Import
if compliance_check_path
::JSON.load( open(compliance_check_path).read )
else
- false
+ nil
end
end
@@ -56,7 +56,7 @@ class Import
elsif cancel_path
Ievkit.delete(cancel_path)
else
- raise Ievkit::Error("Impossible to access delete or cancel path link for import")
+ nil
end
end