[Rt-commit] rt branch, create-action, updated. a7953c48888e23a746bcfc9168aee256e3bef0d7

[sartak at bestpractical.com]

The branch, create-action has been updated
       via  a7953c48888e23a746bcfc9168aee256e3bef0d7 (commit)
      from  d84343698811ac8fd4ae7932cb0d2b07596d3e41 (commit)

Summary of changes:
 lib/RT/Action/CustomFieldBased.pm |    1 -
 lib/RT/Action/QueueBased.pm       |    5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a7953c48888e23a746bcfc9168aee256e3bef0d7
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Nov 4 19:55:50 2009 -0500

    CustomFieldBased and QueueBased actions are mixins

diff --git a/lib/RT/Action/CustomFieldBased.pm b/lib/RT/Action/CustomFieldBased.pm
index bc5d21b..a1ff316 100644
--- a/lib/RT/Action/CustomFieldBased.pm
+++ b/lib/RT/Action/CustomFieldBased.pm
@@ -1,7 +1,6 @@
 package RT::Action::CustomFieldBased;
 use strict;
 use warnings;
-use base 'Jifty::Action';
 
 sub _add_custom_fields {
     my $self = shift;
diff --git a/lib/RT/Action/QueueBased.pm b/lib/RT/Action/QueueBased.pm
index a4cfd73..cae13c3 100644
--- a/lib/RT/Action/QueueBased.pm
+++ b/lib/RT/Action/QueueBased.pm
@@ -1,7 +1,6 @@
 package RT::Action::QueueBased;
 use strict;
 use warnings;
-use base 'Jifty::Action';
 
 use Jifty::Param::Schema;
 use Jifty::Action schema {
@@ -12,6 +11,10 @@ use Jifty::Action schema {
         label is _('Queue');
 };
 
+# We really do not want to inherit from Jifty::Action. This is a mixin, and
+# inheriting from Jifty::Action causes diamond inheritance.
+our @ISA = ();
+
 sub arguments {
     my $self = shift;
 

-----------------------------------------------------------------------