[Rt-commit] rt branch, 4.0/current-user-outdated-email-name-fix, updated. rt-4.0.1rc1-9-g25415d1

? sunnavy sunnavy at bestpractical.com
Tue May 24 23:07:46 EDT 2011


The branch, 4.0/current-user-outdated-email-name-fix has been updated
       via  25415d19dd1db25fcbd607e659561dffbd4ef2f7 (commit)
       via  af7e1620d315da8b971e45de60b205caa8cd4e16 (commit)
       via  f2e094b711bd2f0a531f44b4847f8d8558ed498b (commit)
      from  aa2d329d5e95737a70b789c531bc4019a65050a8 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm                         |   10 +++++++++-
 share/html/Approvals/Elements/PendingMyApproval |    2 +-
 share/html/Dashboards/Subscription.html         |    2 +-
 share/html/Elements/QuickCreate                 |    2 +-
 share/html/REST/1.0/Forms/ticket/default        |    4 ++--
 share/html/SelfService/Create.html              |    2 +-
 share/html/Ticket/Create.html                   |    2 +-
 share/html/m/ticket/create                      |    2 +-
 8 files changed, 17 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit f2e094b711bd2f0a531f44b4847f8d8558ed498b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 25 10:32:01 2011 +0800

    load current user on every request to keep the info up to date

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 597f728..2846c82 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -230,7 +230,15 @@ sub HandleRequest {
 
     $HTML::Mason::Commands::m->comp( '/Elements/SetupSessionCookie', %$ARGS );
     SendSessionCookie();
-    $HTML::Mason::Commands::session{'CurrentUser'} = RT::CurrentUser->new() unless _UserLoggedIn();
+
+    if ( _UserLoggedIn() ) {
+        # make user info up to date
+        $HTML::Mason::Commands::session{'CurrentUser'}
+          ->Load( $HTML::Mason::Commands::session{'CurrentUser'}->id );
+    }
+    else {
+        $HTML::Mason::Commands::session{'CurrentUser'} = RT::CurrentUser->new();
+    }
 
     # Process session-related callbacks before any auth attempts
     $HTML::Mason::Commands::m->callback( %$ARGS, CallbackName => 'Session', CallbackPage => '/autohandler' );

commit af7e1620d315da8b971e45de60b205caa8cd4e16
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 25 10:34:27 2011 +0800

    Revert "$session{CurrentUser}'s EmailAddress and Name may be out of date."
    
    This reverts commit be826107fb772bf5661940f95feac4884aad0f95.

diff --git a/share/html/Elements/QuickCreate b/share/html/Elements/QuickCreate
index d442055..40941d6 100644
--- a/share/html/Elements/QuickCreate
+++ b/share/html/Elements/QuickCreate
@@ -68,7 +68,7 @@
 </tr>
 <tr class="input-row">
     <td class="label"><&|/l&>Requestors</&>:</td>
-    <td colspan="3" class="value"><& /Elements/EmailInput, Name => 'Requestors', Size => '40', Default => $ARGS{Requestors} || $session{CurrentUser}->UserObj->EmailAddress &></td>
+    <td colspan="3" class="value"><& /Elements/EmailInput, Name => 'Requestors', Size => '40', Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress &></td>
 </tr>
 <tr class="input-row">
 <td class="labeltop"><&|/l&>Content</&>:</td>
diff --git a/share/html/REST/1.0/Forms/ticket/default b/share/html/REST/1.0/Forms/ticket/default
index 6ee7035..48aec8b 100755
--- a/share/html/REST/1.0/Forms/ticket/default
+++ b/share/html/REST/1.0/Forms/ticket/default
@@ -107,7 +107,7 @@ else {
             {
                 id               => "ticket/new",
                 Queue            => $queue->Name,
-                Requestor        => $session{CurrentUser}->UserObj->Name,
+                Requestor        => $session{CurrentUser}->Name,
                 Subject          => "",
                 Cc               => [],
                 AdminCc          => [],
@@ -162,7 +162,7 @@ else {
         if ($text) {
             $v{MIMEObj} =
                 MIME::Entity->build(
-                    From => $session{CurrentUser}->UserObj->EmailAddress,
+                    From => $session{CurrentUser}->EmailAddress,
                     Subject => $v{Subject},
                     Data => $text
                 );
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 7862f74..ec86fb7 100755
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -67,7 +67,7 @@
 <&|/l&>Requestors</&>:
 </td>
 <td class="value">
-<& /Elements/EmailInput, Name => 'Requestors', Size => '20', Default => $ARGS{Requestors} || $session{CurrentUser}->UserObj->EmailAddress &>
+<& /Elements/EmailInput, Name => 'Requestors', Size => '20', Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress &>
 </td>
 </tr>
 <tr>
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 2b9e7e4..fb70c2b 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -116,7 +116,7 @@
 <&|/l&>Requestors</&>:
 </td>
 <td class="value" colspan="5">
-<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => $ARGS{Requestors} || $session{CurrentUser}->UserObj->EmailAddress &>
+<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress &>
 % $m->callback( CallbackName => 'AfterRequestors', QueueObj => $QueueObj, ARGSRef => \%ARGS );
 </td>
 </tr>
diff --git a/share/html/m/ticket/create b/share/html/m/ticket/create
index 970f85f..5ddb6b8 100644
--- a/share/html/m/ticket/create
+++ b/share/html/m/ticket/create
@@ -308,7 +308,7 @@ $showrows->(
         "/Elements/EmailInput",
         Name    => 'Requestors',
         Size    => '40',
-        Default => $ARGS{Requestors} || $session{CurrentUser}->UserObj->EmailAddress
+        Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress
     ),
 
     loc("Cc") =>

commit 25415d19dd1db25fcbd607e659561dffbd4ef2f7
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 25 11:05:19 2011 +0800

    use CurrentUser->EmailAddress consistently

diff --git a/share/html/Approvals/Elements/PendingMyApproval b/share/html/Approvals/Elements/PendingMyApproval
index 788f0e8..28067c6 100755
--- a/share/html/Approvals/Elements/PendingMyApproval
+++ b/share/html/Approvals/Elements/PendingMyApproval
@@ -74,7 +74,7 @@ $tickets->LimitOwner( VALUE => $session{'CurrentUser'}->Id );
 
 # also consider AdminCcs as potential approvers.
 my $group_tickets = RT::Tickets->new( $session{'CurrentUser'} );
-$group_tickets->LimitWatcher( VALUE => $session{'CurrentUser'}->UserObj->EmailAddress, TYPE => 'AdminCc' );
+$group_tickets->LimitWatcher( VALUE => $session{'CurrentUser'}->EmailAddress, TYPE => 'AdminCc' );
 
 my $created_before = RT::Date->new( $session{'CurrentUser'} );
 my $created_after = RT::Date->new( $session{'CurrentUser'} );
diff --git a/share/html/Dashboards/Subscription.html b/share/html/Dashboards/Subscription.html
index 3d2d5e5..3c44ed3 100644
--- a/share/html/Dashboards/Subscription.html
+++ b/share/html/Dashboards/Subscription.html
@@ -171,7 +171,7 @@
 <&|/l&>Recipient</&>:
 </td><td class="value">
 <input name="Recipient" id="Recipient" size="30" value="<%$fields{Recipient} ? $fields{Recipient} : ''%>" />
-<div class="hints"><% loc("Leave blank to send to your current email address ([_1])", $session{'CurrentUser'}->UserObj->EmailAddress) %></div>
+<div class="hints"><% loc("Leave blank to send to your current email address ([_1])", $session{'CurrentUser'}->EmailAddress) %></div>
 </td></tr>
 </table>
 </&>

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


More information about the Rt-commit mailing list