Return-Path: Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: (qmail 2415 invoked from network); 20 Jul 2009 17:02:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jul 2009 17:02:13 -0000 Received: (qmail 89752 invoked by uid 500); 20 Jul 2009 17:03:18 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 89622 invoked by uid 500); 20 Jul 2009 17:03:18 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 89613 invoked by uid 99); 20 Jul 2009 17:03:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2009 17:03:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2009 17:03:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6C2662388891; Mon, 20 Jul 2009 17:02:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795920 - in /labs/magma/trunk/fragment-user-web/src/main: java/org/apache/magma/web/user/UserWebHandler.java resources/org/apache/magma/web/user/noUserFound.vm Date: Mon, 20 Jul 2009 17:02:54 -0000 To: commits@labs.apache.org From: simoneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090720170254.6C2662388891@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simoneg Date: Mon Jul 20 17:02:54 2009 New Revision: 795920 URL: http://svn.apache.org/viewvc?rev=795920&view=rev Log: LABS-391 : fixed case where user is null Added: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/noUserFound.vm Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java?rev=795920&r1=795919&r2=795920&view=diff ============================================================================== --- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java (original) +++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java Mon Jul 20 17:02:54 2009 @@ -63,10 +63,14 @@ return (HtmlProducer) doShow(user).compoundWith(new TemplatingProducer("registered").addParameter("user", user), CompoundType.BEFORE); } - public HtmlProducer doActivate(User user){ - user.setActive(true); - new Database().save(user); - return new TemplatingProducer("activated").addParameter("user", user); + public HtmlProducer doActivate(User user) { + if (user != null) { + user.setActive(true); + new Database().save(user); + return new TemplatingProducer("activated").addParameter("user", user); + } else { + return new TemplatingProducer("noUserFound"); + } } Added: labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/noUserFound.vm URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/noUserFound.vm?rev=795920&view=auto ============================================================================== --- labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/noUserFound.vm (added) +++ labs/magma/trunk/fragment-user-web/src/main/resources/org/apache/magma/web/user/noUserFound.vm Mon Jul 20 17:02:54 2009 @@ -0,0 +1,6 @@ +

+ $i18n.tr("No user found") +

+

+ $i18n.tr("Hi "), $i18n.tr("your account seems to have been deleted or not available anymore.") +

--------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org