Author: taylor
Date: Mon Dec 4 14:32:08 2006
New Revision: 482392
URL: http://svn.apache.org/viewvc?view=rev&rev=482392
Log:
don't log errors when user folder not found since users are not required to
have home pages
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?view=diff&rev=482392&r1=482391&r2=482392
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
Mon Dec 4 14:32:08 2006
@@ -561,13 +561,13 @@
{
userManager.removeUser(userName);
PortletMessaging.publish(actionRequest,
SecurityResources.TOPIC_USERS, SecurityResources.MESSAGE_REFRESH, "true");
-
- // TODO: remove ALL user from PSML
- Page page = pageManager.getPage(Folder.USER_FOLDER + userName
+ "/default-page.psml");
- pageManager.removePage(page);
-
- Folder folder = pageManager.getFolder(Folder.USER_FOLDER +
userName);
- pageManager.removeFolder(folder);
+
+ // TODO: handle subsite roots
+ if (pageManager.folderExists(Folder.USER_FOLDER + userName))
+ {
+ Folder folder = pageManager.getFolder(Folder.USER_FOLDER +
userName);
+ pageManager.removeFolder(folder);
+ }
// remove selected user from USERS_TOPIC
PortletMessaging.cancel(actionRequest,SecurityResources.TOPIC_USERS,
SecurityResources.MESSAGE_SELECTED);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
