[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-529-g21079ec

Jesse Vincent jesse at bestpractical.com
Tue Aug 24 12:53:16 EDT 2010


The branch, 3.9-trunk has been updated
       via  21079ecce0ba186410219dd8cc73451272fa64a2 (commit)
       via  427f27fc77ceb7337dd3ef7981ea18088d65db0f (commit)
       via  52741ef5d1b05f0b84cc365b4b6206e32b0e9000 (commit)
      from  d57c85f2a395e5a861de019bd4898681927197da (commit)

Summary of changes:
 lib/RT/Attachment_Overlay.pm             |    2 +-
 lib/RT/Attribute_Overlay.pm              |    2 +-
 lib/RT/CachedGroupMember_Overlay.pm      |    2 +-
 lib/RT/CustomField_Overlay.pm            |    8 ++++----
 lib/RT/CustomFields_Overlay.pm           |    2 +-
 lib/RT/ObjectCustomFieldValue_Overlay.pm |    2 +-
 lib/RT/Queue_Overlay.pm                  |    2 +-
 lib/RT/User_Overlay.pm                   |    4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 52741ef5d1b05f0b84cc365b4b6206e32b0e9000
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Aug 24 12:54:23 2010 -0400

    Remove a bunch of calls to SUPER::$this that just invoked the autoload
    subs. instead, actually call what they're calling.
    
    This behavior depended on an old quirk of searchbuilder

diff --git a/lib/RT/Attachment_Overlay.pm b/lib/RT/Attachment_Overlay.pm
index f91d709..f0c730c 100644
--- a/lib/RT/Attachment_Overlay.pm
+++ b/lib/RT/Attachment_Overlay.pm
@@ -619,7 +619,7 @@ per array entry. multiple lines are folded.
 
 sub _SplitHeaders {
     my $self = shift;
-    my $headers = (shift || $self->SUPER::Headers());
+    my $headers = (shift || $self->_Value('Headers'));
     my @headers;
     for (split(/\n(?=\w|\z)/,$headers)) {
         push @headers, $_;
diff --git a/lib/RT/Attribute_Overlay.pm b/lib/RT/Attribute_Overlay.pm
index cc81da5..bbba8b1 100644
--- a/lib/RT/Attribute_Overlay.pm
+++ b/lib/RT/Attribute_Overlay.pm
@@ -282,7 +282,7 @@ sub SetContent {
             return(0, "Content couldn't be frozen");
         }
     }
-    return $self->SUPER::SetContent( $content );
+    return $self->_Set( Field => 'Content', Value => $content );
 }
 
 =head2 SubValue KEY
diff --git a/lib/RT/CachedGroupMember_Overlay.pm b/lib/RT/CachedGroupMember_Overlay.pm
index 19607f6..a6e6f2e 100755
--- a/lib/RT/CachedGroupMember_Overlay.pm
+++ b/lib/RT/CachedGroupMember_Overlay.pm
@@ -264,7 +264,7 @@ sub SetDisabled {
  
     # if it's already disabled, we're good.
     return (1) if ( $self->__Value('Disabled') == $val);
-    my $err = $self->SUPER::SetDisabled($val);
+    my $err = $self->_Set(Field => 'Disabled', Value => $val);
     my ($retval, $msg) = $err->as_array();
     unless ($retval) {
         $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id .": $msg");
diff --git a/lib/RT/CustomField_Overlay.pm b/lib/RT/CustomField_Overlay.pm
index b3a02c6..0de829e 100755
--- a/lib/RT/CustomField_Overlay.pm
+++ b/lib/RT/CustomField_Overlay.pm
@@ -644,7 +644,7 @@ sub SetType {
         $RT::Logger->warning("'Single' and 'Multiple' on SetType deprecated, use SetMaxValues instead at (". join(":",caller).")");
         $self->SetMaxValues($1 ? 1 : 0);
     }
-    $self->SUPER::SetType($type);
+    $self->_Set(Field => 'Type', Value =>$type);
 }
 
 =head2 SetPattern STRING
@@ -661,7 +661,7 @@ sub SetPattern {
 
     my ($ok, $msg) = $self->_IsValidRegex($regex);
     if ($ok) {
-        return $self->SUPER::SetPattern($regex);
+        return $self->_Set(Field => 'Pattern', Value => $regex);
     }
     else {
         return (0, $self->loc("Invalid pattern: [_1]", $msg));
@@ -968,7 +968,7 @@ sub SetLookupType {
         $ObjectCustomFields->LimitToCustomField($self->Id);
         $_->Delete foreach @{$ObjectCustomFields->ItemsArrayRef};
     }
-    return $self->SUPER::SetLookupType($lookup);
+    return $self->_Set(Field => 'LookupType', Value =>$lookup);
 }
 
 =head2 LookupTypes
diff --git a/lib/RT/ObjectCustomFieldValue_Overlay.pm b/lib/RT/ObjectCustomFieldValue_Overlay.pm
index ecac9e4..2426eee 100644
--- a/lib/RT/ObjectCustomFieldValue_Overlay.pm
+++ b/lib/RT/ObjectCustomFieldValue_Overlay.pm
@@ -174,7 +174,7 @@ content, try "LargeContent"
 
 sub Content {
     my $self = shift;
-    my $content = $self->SUPER::Content;
+    my $content = $self->_Value('Content');
     if ( !(defined $content && length $content) && $self->ContentType && $self->ContentType eq 'text/plain' ) {
         return $self->LargeContent;
     } else {
diff --git a/lib/RT/Queue_Overlay.pm b/lib/RT/Queue_Overlay.pm
index dff2ba2..6069151 100755
--- a/lib/RT/Queue_Overlay.pm
+++ b/lib/RT/Queue_Overlay.pm
@@ -390,7 +390,7 @@ sub SetDisabled {
     my $val = shift;
 
     $RT::Handle->BeginTransaction();
-    my $set_err = $self->SUPER::SetDisabled($val);
+    my $set_err = $self->_Set( Field =>'Disabled', Value => $val);
     unless ($set_err) {
         $RT::Handle->Rollback();
         $RT::Logger->warning("Couldn't ".($val == 1) ? "disable" : "enable"." queue ".$self->PrincipalObj->Id);
diff --git a/lib/RT/User_Overlay.pm b/lib/RT/User_Overlay.pm
index b5b4e87..bd02621 100755
--- a/lib/RT/User_Overlay.pm
+++ b/lib/RT/User_Overlay.pm
@@ -808,7 +808,7 @@ sub SetPassword {
     else {
         my $new = !$self->HasPassword;
         $password = $self->_GeneratePassword($password);
-        my ( $val, $msg ) = $self->SUPER::SetPassword($password);
+        my ( $val, $msg ) = $self->_Set(Field => 'Password', Value => $password);
         if ($val) {
             return ( 1, $self->loc("Password set") ) if $new;
             return ( 1, $self->loc("Password changed") );
@@ -906,7 +906,7 @@ sub IsPassword {
         or $self->_GeneratePasswordBase64($value) eq $self->__Value('Password'))
     {
         # ...but upgrade the legacy password inplace.
-        $self->SUPER::SetPassword( $self->_GeneratePassword($value) );
+        $self->_Set(Field => 'Password', Value =>  $self->_GeneratePassword($value) );
         return(1);
     }
 

commit 427f27fc77ceb7337dd3ef7981ea18088d65db0f
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Aug 24 12:55:15 2010 -0400

    Drop a debug message down to debug

diff --git a/lib/RT/CustomField_Overlay.pm b/lib/RT/CustomField_Overlay.pm
index 0de829e..e87512a 100755
--- a/lib/RT/CustomField_Overlay.pm
+++ b/lib/RT/CustomField_Overlay.pm
@@ -250,7 +250,7 @@ sub Create {
     return (0, $self->loc("Invalid pattern: [_1]", $msg)) unless $ok;
 
     if ( $args{'MaxValues'} != 1 && $args{'Type'} =~ /(text|combobox)$/i ) {
-        $RT::Logger->warning("Support for 'multiple' Texts or Comboboxes is not implemented");
+        $RT::Logger->debug("Support for 'multiple' Texts or Comboboxes is not implemented");
         $args{'MaxValues'} = 1;
     }
 

commit 21079ecce0ba186410219dd8cc73451272fa64a2
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Aug 24 12:55:35 2010 -0400

    Fix a longstanding typo in a method call

diff --git a/lib/RT/CustomFields_Overlay.pm b/lib/RT/CustomFields_Overlay.pm
index 5d95188..e79e08a 100755
--- a/lib/RT/CustomFields_Overlay.pm
+++ b/lib/RT/CustomFields_Overlay.pm
@@ -355,7 +355,7 @@ sub Next {
     my $CF = $self->SUPER::Next();
     return $CF unless $CF;
 
-    $CF->SetContextOject( $self->ContextObject );
+    $CF->SetContextObject( $self->ContextObject );
 
     return $self->Next unless $CF->CurrentUserHasRight('SeeCustomField');
     return $CF;

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


More information about the Rt-commit mailing list