[Rt-commit] [rtir] 09/14: Use something not string eval to load local overlays
Kevin Falcone
falcone at bestpractical.com
Wed Oct 8 18:11:57 EDT 2014
This is an automated email from the git hooks/post-receive script.
falcone pushed a commit to branch 3.4/perlcritic
in repository rtir.
commit 07f3ed1ecc537970965460cef2c237ed48a56091
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Mon Aug 29 17:36:39 2011 -0400
Use something not string eval to load local overlays
---
lib/RT/Action/RTIR.pm | 2 +-
lib/RT/Action/RTIR_Activate.pm | 2 +-
lib/RT/Action/RTIR_ChangeChildOwnership.pm | 2 +-
lib/RT/Action/RTIR_ChangeParentOwnership.pm | 2 +-
lib/RT/Action/RTIR_FindIP.pm | 2 +-
lib/RT/Action/RTIR_MergeIPs.pm | 2 +-
lib/RT/Action/RTIR_OpenParent.pm | 2 +-
lib/RT/Action/RTIR_ResolveChildren.pm | 2 +-
lib/RT/Action/RTIR_SetConstituency.pm | 2 +-
lib/RT/Action/RTIR_SetConstituencyGroup.pm | 2 +-
lib/RT/Action/RTIR_SetDueIncident.pm | 2 +-
lib/RT/Action/RTIR_SetHowReported.pm | 2 +-
lib/RT/Action/RTIR_SetIncidentResolution.pm | 2 +-
lib/RT/Condition/RTIR.pm | 2 +-
lib/RT/Condition/RTIR_CustomerResponse.pm | 2 +-
lib/RT/Condition/RTIR_LinkingToIncident.pm | 2 +-
lib/RT/Condition/RTIR_Merge.pm | 2 +-
lib/RT/Condition/RTIR_RequireConstituencyChange.pm | 2 +-
lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm | 2 +-
lib/RT/Condition/RTIR_RequireDueChange.pm | 2 +-
lib/RT/Condition/RTIR_RequireReportActivation.pm | 2 +-
lib/RT/Condition/RTIR_StaffResponse.pm | 2 +-
lib/RT/IR.pm | 14 +++++++++++++-
23 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/lib/RT/Action/RTIR.pm b/lib/RT/Action/RTIR.pm
index 096deb0..3ae50bf 100644
--- a/lib/RT/Action/RTIR.pm
+++ b/lib/RT/Action/RTIR.pm
@@ -117,6 +117,6 @@ sub CopyCustomFields {
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_Activate.pm b/lib/RT/Action/RTIR_Activate.pm
index f713845..6c2ff64 100644
--- a/lib/RT/Action/RTIR_Activate.pm
+++ b/lib/RT/Action/RTIR_Activate.pm
@@ -75,6 +75,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_ChangeChildOwnership.pm b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
index a1789b1..b8c7b49 100644
--- a/lib/RT/Action/RTIR_ChangeChildOwnership.pm
+++ b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
@@ -90,6 +90,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_ChangeParentOwnership.pm b/lib/RT/Action/RTIR_ChangeParentOwnership.pm
index b80a6db..1561833 100644
--- a/lib/RT/Action/RTIR_ChangeParentOwnership.pm
+++ b/lib/RT/Action/RTIR_ChangeParentOwnership.pm
@@ -82,6 +82,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_FindIP.pm b/lib/RT/Action/RTIR_FindIP.pm
index fd2f1da..e570440 100644
--- a/lib/RT/Action/RTIR_FindIP.pm
+++ b/lib/RT/Action/RTIR_FindIP.pm
@@ -162,6 +162,6 @@ sub AddIP {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_MergeIPs.pm b/lib/RT/Action/RTIR_MergeIPs.pm
index 4379171..2a8d325 100644
--- a/lib/RT/Action/RTIR_MergeIPs.pm
+++ b/lib/RT/Action/RTIR_MergeIPs.pm
@@ -81,6 +81,6 @@ sub Commit {
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_OpenParent.pm b/lib/RT/Action/RTIR_OpenParent.pm
index f874e23..13157ac 100644
--- a/lib/RT/Action/RTIR_OpenParent.pm
+++ b/lib/RT/Action/RTIR_OpenParent.pm
@@ -85,6 +85,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_ResolveChildren.pm b/lib/RT/Action/RTIR_ResolveChildren.pm
index 779ad7a..f9e1bbe 100644
--- a/lib/RT/Action/RTIR_ResolveChildren.pm
+++ b/lib/RT/Action/RTIR_ResolveChildren.pm
@@ -105,6 +105,6 @@ END
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_SetConstituency.pm b/lib/RT/Action/RTIR_SetConstituency.pm
index e2ade12..53cca2a 100644
--- a/lib/RT/Action/RTIR_SetConstituency.pm
+++ b/lib/RT/Action/RTIR_SetConstituency.pm
@@ -212,6 +212,6 @@ sub IsValidConstituency {
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_SetConstituencyGroup.pm b/lib/RT/Action/RTIR_SetConstituencyGroup.pm
index 4134941..b100573 100644
--- a/lib/RT/Action/RTIR_SetConstituencyGroup.pm
+++ b/lib/RT/Action/RTIR_SetConstituencyGroup.pm
@@ -120,6 +120,6 @@ sub ConstituencyValues {
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_SetDueIncident.pm b/lib/RT/Action/RTIR_SetDueIncident.pm
index 6b7ae4e..dc3dcf0 100644
--- a/lib/RT/Action/RTIR_SetDueIncident.pm
+++ b/lib/RT/Action/RTIR_SetDueIncident.pm
@@ -119,6 +119,6 @@ sub UpdateDue {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_SetHowReported.pm b/lib/RT/Action/RTIR_SetHowReported.pm
index bc4ee74..0bc4082 100644
--- a/lib/RT/Action/RTIR_SetHowReported.pm
+++ b/lib/RT/Action/RTIR_SetHowReported.pm
@@ -73,6 +73,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Action/RTIR_SetIncidentResolution.pm b/lib/RT/Action/RTIR_SetIncidentResolution.pm
index 9e8626b..e88d2b6 100644
--- a/lib/RT/Action/RTIR_SetIncidentResolution.pm
+++ b/lib/RT/Action/RTIR_SetIncidentResolution.pm
@@ -89,6 +89,6 @@ sub Commit {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR.pm b/lib/RT/Condition/RTIR.pm
index 2eb5e78..b03377e 100644
--- a/lib/RT/Condition/RTIR.pm
+++ b/lib/RT/Condition/RTIR.pm
@@ -72,6 +72,6 @@ sub IsStaff {
return RT::IR->IsStaff($actor_id);
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_CustomerResponse.pm b/lib/RT/Condition/RTIR_CustomerResponse.pm
index 71428e9..332eccd 100644
--- a/lib/RT/Condition/RTIR_CustomerResponse.pm
+++ b/lib/RT/Condition/RTIR_CustomerResponse.pm
@@ -76,6 +76,6 @@ sub IsApplicable {
return !$self->IsStaff;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_LinkingToIncident.pm b/lib/RT/Condition/RTIR_LinkingToIncident.pm
index d93e03a..355319e 100644
--- a/lib/RT/Condition/RTIR_LinkingToIncident.pm
+++ b/lib/RT/Condition/RTIR_LinkingToIncident.pm
@@ -90,6 +90,6 @@ sub IsApplicable {
return 0;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_Merge.pm b/lib/RT/Condition/RTIR_Merge.pm
index 4292308..1d7c806 100644
--- a/lib/RT/Condition/RTIR_Merge.pm
+++ b/lib/RT/Condition/RTIR_Merge.pm
@@ -67,6 +67,6 @@ sub IsApplicable {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_RequireConstituencyChange.pm b/lib/RT/Condition/RTIR_RequireConstituencyChange.pm
index 7df9205..ec09563 100644
--- a/lib/RT/Condition/RTIR_RequireConstituencyChange.pm
+++ b/lib/RT/Condition/RTIR_RequireConstituencyChange.pm
@@ -74,6 +74,6 @@ sub IsApplicable {
return 0;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm b/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm
index aec2da2..0118d12 100644
--- a/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm
+++ b/lib/RT/Condition/RTIR_RequireConstituencyGroupChange.pm
@@ -73,6 +73,6 @@ sub IsApplicable {
return 0;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_RequireDueChange.pm b/lib/RT/Condition/RTIR_RequireDueChange.pm
index 7312402..240630e 100644
--- a/lib/RT/Condition/RTIR_RequireDueChange.pm
+++ b/lib/RT/Condition/RTIR_RequireDueChange.pm
@@ -80,6 +80,6 @@ sub IsApplicable {
return 0;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_RequireReportActivation.pm b/lib/RT/Condition/RTIR_RequireReportActivation.pm
index 6bb1de6..a671775 100644
--- a/lib/RT/Condition/RTIR_RequireReportActivation.pm
+++ b/lib/RT/Condition/RTIR_RequireReportActivation.pm
@@ -85,6 +85,6 @@ sub IsApplicable {
return 1;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/Condition/RTIR_StaffResponse.pm b/lib/RT/Condition/RTIR_StaffResponse.pm
index f7a1382..78b7748 100644
--- a/lib/RT/Condition/RTIR_StaffResponse.pm
+++ b/lib/RT/Condition/RTIR_StaffResponse.pm
@@ -69,6 +69,6 @@ sub IsApplicable {
return $self->IsStaff;
}
-RT::Base->_ImportOverlays;
+RT::IR->ImportOverlays;
1;
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 8269cb7..a783f91 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -1021,6 +1021,18 @@ sub HandleRtirrequestor {
package RT::IR;
-RT::Base->_ImportOverlays;
+sub ImportOverlays {
+ my $class = shift;
+ my ($package,undef,undef) = caller();
+ $package =~ s|::|/|g;
+ for my $type (qw(Overlay Vendor Local)) {
+ my $filename = $package."_".$type.".pm";
+ eval { require $filename };
+ die $@ if ($@ && $@ !~ qr{^Can't locate $filename});
+ }
+ return;
+}
+
+__PACKAGE__->ImportOverlays();
1;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the rt-commit
mailing list