You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2010/07/12 09:09:40 UTC
svn commit: r963197 - in /incubator/esme/trunk/server/src/main:
scala/org/apache/esme/lib/AccessPoolMgr.scala webapp/pools_view/index.html
Author: rhirsch
Date: Mon Jul 12 07:09:40 2010
New Revision: 963197
URL: http://svn.apache.org/viewvc?rev=963197&view=rev
Log:
[ESME-241] No error when adding an unknown user to a pool
Patch by Imtiaz Ahmed Hajee Esmail
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
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=963197&r1=963196&r2=963197&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 Mon Jul 12 07:09:40 2010
@@ -183,8 +183,8 @@ object AccessPoolMgr {
pool = lastSelPool;
val r: Box[Boolean] =
for (admin <- adminUser;
- p <- AccessPool.find(pool) ?~ DisplayMessage("messages", <b>{S.?("base_pool_err_pool_not_found")}</b>, 3 seconds, 2 seconds);
- user <- User.findFromWeb(username) ?~ DisplayMessage("messages", <b>{S.?("base_pool_err_pool_not_found")}</b>, 3 seconds, 2 seconds)
+ p <- AccessPool.find(pool) ?~ S.?("base_pool_err_pool_not_found"); //DisplayMessage("messages", <b>{S.?("base_pool_err_pool_not_found")}</b>, 3 seconds, 2 seconds);
+ user <- User.findFromWeb(username) ?~ S.?("base_pool_err_user_not_found") //DisplayMessage("messages", <b>{S.?("base_pool_err_user_not_found")}</b>, 3 seconds, 2 seconds)
) yield if(Privilege.hasPermission(admin.id.is, p.id.is, Permission.Admin)) {
val result = try {
import org.apache.esme.model.Permission
@@ -198,16 +198,23 @@ object AccessPoolMgr {
}
result
} else false // "User has no permission to administer pool"
+ /*
r match {
case Failure(m,_,_) => S.error(m)
case Full(true) => S.notice(S.?("base_pool_msg_permission_set"))
case _ => S.error(S.?("base_error_general"))
}
+ */
poolId.set(pool.toLong)
+ ( r match {
+ case Failure(m,_,_) => DisplayMessage("messages", <b>{m}</b>, 3 seconds, 2 seconds)//S.error(m)
+ case Full(true) => DisplayMessage("messages", <b>{S.?("base_pool_msg_permission_set")}</b>, 3 seconds, 2 seconds)//S.notice(S.?("base_pool_msg_permission_set"))
+ case _ => DisplayMessage("messages", <b>{S.?("base_error_general")}</b>, 3 seconds, 2 seconds)//S.error(S.?("base_error_general"))
+ } ) &
//we needn't redisplay pool detail when add a new user
- redisplayPool() & SetValById(editUsername, "")
+ redisplayPool() & SetValById(editUsername, "")
}
/*
Modified: incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/pools_view/index.html?rev=963197&r1=963196&r2=963197&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/pools_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/pools_view/index.html Mon Jul 12 07:09:40 2010
@@ -26,6 +26,14 @@
<lift:TableSorterSnip/>
</head>
<div id="back-header">
+ <div id="messages"></div>
+ <lift:Msgs>
+ <lift:error_class>error_major</lift:error_class>
+ <lift:notice_msg>
+ <lift:loc>ui_base_note</lift:loc>
+ </lift:notice_msg>
+ <lift:notice_class>note_major</lift:notice_class>
+ </lift:Msgs>
<h1>
<lift:loc>ui_pool_manage</lift:loc>
</h1>