[Jifty-commit] jifty branch, jifty_client, updated. a7243571c8649fb866c8dd44cbacc417e6bddc3e

Jifty commits jifty-commit at lists.jifty.org
Thu May 13 13:42:10 EDT 2010


The branch, jifty_client has been updated
       via  a7243571c8649fb866c8dd44cbacc417e6bddc3e (commit)
       via  6c896e63b75ca2510e6320d74c5536bb92596e29 (commit)
       via  9badf34cd8635ce8b3a14157f7ab45a2fb4fb5b4 (commit)
       via  9959e11094a158fc3a7c09f704a215736f8bf32f (commit)
      from  8be16a67b2e7d03add02b16ce4bad1970048ab23 (commit)

Summary of changes:
 lib/Jifty/Action/AboutMe.pm |    2 +-
 lib/Jifty/CurrentUser.pm    |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 9badf34cd8635ce8b3a14157f7ab45a2fb4fb5b4
Merge: 8be16a6 9959e11
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri May 14 02:39:36 2010 +0900

    Merge branch 'master' into jifty_client


commit 6c896e63b75ca2510e6320d74c5536bb92596e29
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri May 14 02:42:07 2010 +0900

    Add a jifty_serialize_format for CurrentUser objects

diff --git a/lib/Jifty/CurrentUser.pm b/lib/Jifty/CurrentUser.pm
index ce82bb3..c6b9707 100644
--- a/lib/Jifty/CurrentUser.pm
+++ b/lib/Jifty/CurrentUser.pm
@@ -257,6 +257,18 @@ sub current_user_can {
     return (0);
 }
 
+=head2 jifty_serialize_format
+
+Serializes as the user_object.
+
+=cut
+
+sub jifty_serialize_format {
+    my $self = shift;
+    return {} if !$self->user_object;
+    return $self->user_object->jifty_serialize_format(@_);
+}
+
 =head1 SEE ALSO
 
 L<Jifty::Object>, L<Jifty::Plugin::User>

commit a7243571c8649fb866c8dd44cbacc417e6bddc3e
Merge: 9badf34 6c896e6
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri May 14 02:42:31 2010 +0900

    Merge branch 'master' into jifty_client


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


More information about the Jifty-commit mailing list