Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 74511 invoked from network); 18 Jul 2010 13:15:52 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Jul 2010 13:15:52 -0000 Received: (qmail 42159 invoked by uid 500); 18 Jul 2010 13:15:52 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 42128 invoked by uid 500); 18 Jul 2010 13:15:51 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 42120 invoked by uid 99); 18 Jul 2010 13:15:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Jul 2010 13:15:50 +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; Sun, 18 Jul 2010 13:15:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D50DF2388993; Sun, 18 Jul 2010 13:14:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r965224 - in /incubator/esme/trunk/server/src/main/scala/org/apache/esme: lib/AccessPoolMgr.scala model/AccessPool.scala Date: Sun, 18 Jul 2010 13:14:23 -0000 To: esme-commits@incubator.apache.org From: esjewett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100718131423.D50DF2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: esjewett Date: Sun Jul 18 13:14:23 2010 New Revision: 965224 URL: http://svn.apache.org/viewvc?rev=965224&view=rev Log: [ESME-257] Fixes issue displaying pools with no description for me locally Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=965224&r1=965223&r2=965224&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Sun Jul 18 13:14:23 2010 @@ -274,15 +274,16 @@ object AccessPoolMgr { } } - def doRender(): NodeSeq = + def doRender(): NodeSeq = AccessPool.find(By(AccessPool.id, poolId.is)) match { - case Full(ap) => bind( - "pool", in, - "name" -> (if ( ap.getDescription.isEmpty ) ap.getName else ap.getName + " - " + ap.getDescription), - "creator" -> displayUserName(ap.creator), - "createdDate" -> getDateHtml(ap.createdDate), - "modifier" -> displayUserName(ap.modifier), - "lastModifyDate" -> getDateHtml(ap.lastModifyDate)) + case Full(ap) => { + bind( + "pool", in, + "name" -> (if ( ap.description == "" ) ap.getName else ap.getName + " - " + ap.description), + "creator" -> displayUserName( ap.creator ), + "createdDate" -> getDateHtml(ap.createdDate), + "modifier" -> displayUserName(ap.modifier), + "lastModifyDate" -> getDateHtml(ap.lastModifyDate)) } case _ => NodeSeq.Empty } Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala?rev=965224&r1=965223&r2=965224&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala Sun Jul 18 13:14:23 2010 @@ -80,8 +80,7 @@ class AccessPool extends LongKeyedMapper case List(_,_*) => Failure(S.?("base_pool_err_dup_name")) } - def getName() = name.is - def getDescription() = description.is + def getName() = name.is private def sameName(name: String) = AccessPool.findAll(By(AccessPool.name, name)).