[Jifty-commit] r3313 - in jifty/trunk: lib/Jifty share/web/templates/_elements

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Fri Jun  1 14:22:04 2007
New Revision: 3313

Modified:
   jifty/trunk/lib/Jifty/CurrentUser.pm
   jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
   jifty/trunk/lib/Jifty/Record.pm
   jifty/trunk/share/web/templates/_elements/sidebar

Log:
CurrentUser->username now uses brief_description on user_object.


Modified: jifty/trunk/lib/Jifty/CurrentUser.pm
==============================================================================
--- jifty/trunk/lib/Jifty/CurrentUser.pm	(original)
+++ jifty/trunk/lib/Jifty/CurrentUser.pm	Fri Jun  1 14:22:04 2007
@@ -160,7 +160,7 @@
 sub username {
     my $self = shift;
     return undef unless ($self->user_object);
-    return($self->user_object->username(@_));
+    return($self->user_object->brief_description(@_));
 }
 
 =head2 auth_token

Modified: jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	Fri Jun  1 14:22:04 2007
@@ -26,9 +26,7 @@
         if (    Jifty->web->current_user->id
             and Jifty->web->current_user->user_object )
         {
-            my $u      = Jifty->web->current_user->user_object;
-            my $method = $u->_brief_description;
-            eval {_( 'Hiya, %1.', $u->$method() )};
+            _( 'Hiya, %1.', Jifty->web->current_user->username );
         }
         else {
             _("You're not currently signed in.");

Modified: jifty/trunk/lib/Jifty/Record.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Record.pm	(original)
+++ jifty/trunk/lib/Jifty/Record.pm	Fri Jun  1 14:22:04 2007
@@ -454,6 +454,18 @@
     $self->SUPER::delete(@_); 
 }
 
+=head2 brief_description
+
+Display the friendly name of the record according to _brief_description.
+
+=cut
+
+sub brief_description {
+    my $self = shift;
+    my $method = $self->_brief_description;
+    return $self->$method;
+}
+
 =head2 _brief_description
 
 When displaying a list of records, Jifty can display a friendly value 

Modified: jifty/trunk/share/web/templates/_elements/sidebar
==============================================================================
--- jifty/trunk/share/web/templates/_elements/sidebar	(original)
+++ jifty/trunk/share/web/templates/_elements/sidebar	Fri Jun  1 14:22:04 2007
@@ -1,8 +1,7 @@
 <div id="salutation">
-% if (Jifty->web->current_user->id and Jifty->web->current_user->user_object) {
-% my $u = Jifty->web->current_user->user_object;
-% my $method = $u->_brief_description;
-<%_('Hiya, %1.',$u->$method())%>
+% my $u = Jifty->web->current_user;
+% if ($u->id and $u->user_object) {
+<%_('Hiya, %1.',$u->username)%>
 % }  else {
 <%_("You're not currently signed in.")%>
 % }