esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esjew...@apache.org
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 GMT
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)).



Mime
View raw message