shuber 2004/10/11 18:59:13 CEST
Modified files:
core/src/java/org/jahia/admin/users ManageGroups.java
ManageUsers.java
core/src/webapp/jsp/jahia/administration adminpopup.jsp
core/src/webapp/jsp/jahia/administration/group_management
group_edit.jsp
core/src/webapp/jsp/jahia/administration/homepages/popup
homepagetool.jsp
core/src/webapp/jsp/jahia/administration/user_management
user_create.jsp
user_edit.jsp
Log:
JAHIA 169 : Set Home Page for Users
- Cleanup HTML
- Added home page selection on create user operation
- Fixed problems of parent page loosing data when a popup was being closed.
Revision Changes Path
1.3 +36 -3 jahia/core/src/java/org/jahia/admin/users/ManageGroups.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/users/ManageGroups.java.diff?r1=1.2&r2=1.3&f=h
1.3 +31 -2 jahia/core/src/java/org/jahia/admin/users/ManageUsers.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/users/ManageUsers.java.diff?r1=1.2&r2=1.3&f=h
1.2 +16 -3 jahia/core/src/webapp/jsp/jahia/administration/adminpopup.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/adminpopup.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +7 -0
jahia/core/src/webapp/jsp/jahia/administration/group_management/group_edit.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/group_management/group_edit.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +21 -28
jahia/core/src/webapp/jsp/jahia/administration/homepages/popup/homepagetool.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/homepages/popup/homepagetool.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +24 -4
jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -2
jahia/core/src/webapp/jsp/jahia/administration/user_management/user_edit.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_edit.jsp.diff?r1=1.1&r2=1.2&f=h
Index: ManageGroups.java
===================================================================
RCS file: /cvs/jahia/core/src/java/org/jahia/admin/users/ManageGroups.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManageGroups.java 18 Aug 2004 14:55:46 -0000 1.2
+++ ManageGroups.java 11 Oct 2004 16:59:12 -0000 1.3
@@ -1,4 +1,4 @@
-// $Id: ManageGroups.java,v 1.2 2004/08/18 14:55:46 shuber Exp $
+// $Id: ManageGroups.java,v 1.3 2004/10/11 16:59:12 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -159,8 +159,11 @@
displayGroupCreate(request, response, session);
}
} else if (operation.equals("processEdit")) {
- processGroupEdit(request, response, session);
+ if (processGroupEdit(request, response, session)) {
displayGroupList(request, response, session);
+ } else {
+ displayGroupEdit(request, response, session);
+ }
} else if (operation.equals("processRemove")) {
processGroupRemove(request, response, session);
} else if (operation.equals("processCopy")) {
@@ -399,9 +402,31 @@
//predrag
session.setAttribute("providerName",theGroup.getProviderName());
//end predrag
+
+ if ("update".equals(request.getParameter("actionType"))) {
+ // let's recuperate the members of the group from the selection box
+ // if we are re-displaying the same form.
+ String[] newMembersList = (String[])
request.getParameterValues("selectMember");
+ // convert to HashSet
+ if (newMembersList != null) {
+ Set updatedGroupSet = new HashSet();
+ for (int i = 0; i < newMembersList.length; i++) {
+ // remove identifier type ("u " or "g " and provider) for
future use.
+ JahiaUser usr = (JahiaUser) uMgr.lookupUser(newMembersList[
+ i].substring(1));
+ updatedGroupSet.add(usr);
+ }
+ // display the edit form with initial values
+ request.setAttribute("groupMembers", updatedGroupSet);
//usersViewHelper.getUserListForDisplay(groupMembers));
+ } else {
+ request.setAttribute("groupMembers", new HashSet());
//usersViewHelper.getUserListForDisplay(groupMembers));
+ }
+ } else {
groupMembers = (HashSet)getGroupMembers(groupToEdit, jahiaSite.getID());
// display the edit form with initial values
request.setAttribute("groupMembers", groupMembers);
//usersViewHelper.getUserListForDisplay(groupMembers));
+ }
+
// Get the home page
if (session.getAttribute("homePageLabel") == null) {
int homePageID = theGroup.getHomepageID();
@@ -452,7 +477,7 @@
* @throws ServletException
* @throws JahiaException
*/
- private void processGroupEdit(HttpServletRequest request,
+ private boolean processGroupEdit(HttpServletRequest request,
HttpServletResponse response,
HttpSession session)
throws IOException, ServletException, JahiaException
@@ -461,6 +486,10 @@
String groupName = (String)request.getParameter("groupName");
JahiaGroup grp = gMgr.lookupGroup(jahiaSite.getID(), groupName);
+ if ("update".equals(request.getParameter("actionType"))) {
+ return false;
+ }
+
// Lookup for home page settings and set it.
Integer homePageIDInt = (Integer)session.getAttribute("homePageID");
if (homePageIDInt != null) {
@@ -471,6 +500,8 @@
} else {
grp.removeProperty("group_homepage");
}
+ session.removeAttribute("homePageID");
+ session.removeAttribute("homePageLabel");
}
// let's recuperate the members of the group from the selection box
@@ -509,6 +540,8 @@
groupMessage += " [" + groupName + "] ";
groupMessage +=
JahiaResourceBundle.getAdminResource("org.jahia.admin.groupMessage.updated.label",
jParams, jParams.getLocale());
+
+ return true;
}
/**
Index: ManageUsers.java
===================================================================
RCS file: /cvs/jahia/core/src/java/org/jahia/admin/users/ManageUsers.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManageUsers.java 7 Oct 2004 19:10:47 -0000 1.2
+++ ManageUsers.java 11 Oct 2004 16:59:12 -0000 1.3
@@ -1,4 +1,4 @@
-// $Id: ManageUsers.java,v 1.2 2004/10/07 19:10:47 shuber Exp $
+// $Id: ManageUsers.java,v 1.3 2004/10/11 16:59:12 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -327,6 +327,11 @@
// set request attributes...
request.setAttribute("userProperties", userProperties);
session.setAttribute("userMessage", userMessage);
+ if (session.getAttribute("homePageLabel") == null) {
+ // only set this value the first time we arrive on the form, not
+ // when processing an update.
+ session.setAttribute("homePageLabel", "none");
+ }
request.setAttribute("jspSource", JSP_PATH +
"user_management/user_create.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
@@ -355,6 +360,11 @@
throws IOException, ServletException, JahiaException
{
// get form values...
+ if (!"save".equals(request.getParameter("actionType"))) {
+ // in this case we are just refreshing the form, we do not perform
+ // any saving or checks.
+ return false;
+ }
String username = request.getParameter("username").trim();
if (username.length() == 0) {
userMessage =
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.specifyUserName.label",
@@ -426,6 +436,20 @@
usr.setHomepageID(homePageID);
}
}
+ // Lookup for home page settings and set it.
+ Integer homePageIDInt = (Integer)session.getAttribute("homePageID");
+ if (homePageIDInt != null) {
+ int homePageID = homePageIDInt.intValue();
+ if (homePageID != -1) {
+ logger.debug("Process Home Page ID : " + homePageID);
+ usr.setHomepageID(homePageID);
+ } else {
+ // Why are attributes such JahiaDBUser.mHOMEPAGE_PROP sudenly
private ?
+ usr.removeProperty("user_homepage");
+ }
+ session.removeAttribute("homePageID");
+ session.removeAttribute("homePageLabel");
+ }
return true;
}
@@ -469,7 +493,7 @@
theUser = (JahiaUser)uMgr.lookupUser(userToEdit.substring(1));
}
request.setAttribute("theUser", theUser);
- Properties userProperties = theUser.getProperties();
+ Properties userProperties = (Properties) theUser.getProperties().clone();
if (request.getParameter("firstname") != null) {
userProperties.put("firstname", request.getParameter("firstname"));
}
@@ -561,6 +585,9 @@
// Actualy nothing to do
} else {
// jahia_db usr processing
+ if ("update".equals(request.getParameter("actionType").trim())) {
+ return false;
+ }
String passwd = request.getParameter("passwd").trim();
if (!"".equals(passwd)) {
String passwdConfirm = request.getParameter("passwdconfirm").trim();
@@ -596,6 +623,8 @@
// Why are attributes such JahiaDBUser.mHOMEPAGE_PROP sudenly
private ?
usr.removeProperty("user_homepage");
}
+ session.removeAttribute("homePageID");
+ session.removeAttribute("homePageLabel");
}
userMessage =
JahiaResourceBundle.getAdminResource("org.jahia.admin.userMessage.user.label",
jParams, jParams.getLocale());
Index: adminpopup.jsp
===================================================================
RCS file: /cvs/jahia/core/src/webapp/jsp/jahia/administration/adminpopup.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminpopup.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ adminpopup.jsp 11 Oct 2004 16:59:12 -0000 1.2
@@ -13,6 +13,7 @@
String suicide = (String)request.getAttribute("suicide");
%>
+<script language="javascript"
src="<%=request.getContextPath()%>/jsp/jahia/javascript/selectbox.js"></script>
<script language="javascript">
function submitForm(call, action, subAction)
@@ -20,8 +21,20 @@
document.mainForm.action =
'<%=JahiaAdministration.composeActionURL(request,response,"","")%>' + call + "&sub=" +
action + "&subaction=" + subAction;
document.mainForm.method = "post";
document.mainForm.submit();
- var href = window.opener.location.href;
- window.opener.location.href = href;
+ //var href = window.opener.location.href;
+ //window.opener.location.href = href;
+}
+
+function submitParent() {
+
+ // if there are operations to be performed before the form is submitted,
+ // such as element selection, etc, we perform it now.
+ if (window.opener.beforeSubmit != null) {
+ window.opener.beforeSubmit();
+ }
+
+ window.opener.document.mainForm.actionType.value='update';
+ window.opener.document.mainForm.submit();
}
</script>
@@ -33,7 +46,7 @@
</head>
<body class="text" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"
- onload="<% if (suicide != null) { %>javascript:closePopupWindow()<% } %>">
+ onload="<% if (suicide != null) {
%>javascript:submitParent();closePopupWindow()<% } %>">
<form name="mainForm" method="post" action="">
<table width="100%" height="63" border="0" cellspacing="0" cellpadding="0">
<tr>
Index: group_edit.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/jsp/jahia/administration/group_management/group_edit.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- group_edit.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ group_edit.jsp 11 Oct 2004 16:59:13 -0000 1.2
@@ -54,6 +54,11 @@
index = 0;
}
}
+
+function beforeSubmit() {
+ selectAllOptionsSelectBox(document.mainForm.selectMember);
+}
+
</script>
<!-- Adiministration page position -->
@@ -75,6 +80,8 @@
<td>
<!-- This hidden field is here when one will decide that a group
name can be changed -->
<input type="hidden" name="groupName" value="<%=groupName%>">
+ <!-- This hidden field can be changed to 'update' so that we keep
the edited data without confirming changes -->
+ <input type="hidden" name="actionType" value="save" />
<b><%=groupName%></b>
</td>
</tr>
Index: homepagetool.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/jsp/jahia/administration/homepages/popup/homepagetool.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- homepagetool.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ homepagetool.jsp 11 Oct 2004 16:59:13 -0000 1.2
@@ -47,34 +47,35 @@
<td align="right"><b>:: <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.homePageTool.label"/> ::</b></td>
</tr>
</table>
-<br><br>
+<br>
<table class="text" border="0" cellpadding="0" cellspacing="0" align="center"
width="90%">
<tr>
- <td> </td>
- <td colspan="2">
+ <td colspan="3">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.pleaseChoose.label"/><br>
<br>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.homePageAssociatedInTwoWays.label"/> :<br>
- <li> <nobr><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1.label"/> :</nobr>
- <br> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1Step1.label"/>,
- <br> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1Step2.label"/>.
- <li> <nobr><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2.label"/> :</nobr>
- <br> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2Step1.label"/>,
- <br> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2Step2.label"/>.
- <br>
- <br>
- <br>
+ <ul>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1.label"/> :
+ <br><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1Step1.label"/>,
+ <br><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way1Step2.label"/>.
+ </li>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2.label"/> :
+ <br><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2Step1.label"/>,
+ <br><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.way2Step2.label"/>.
+ </li>
+ </ul>
+ <br />
</td>
</tr>
<% String choiceIndex = "[1]";
if (homePageEnumeration.hasMoreElements()) { %>
<tr>
<td>
- 1.<input type="radio" name="choice" value="homePageDef"
+ <input type="radio" name="choice" value="homePageDef"
onclick="javascript:document.mainForm.homePageDefID.focus();">
</td>
<td colspan="2">
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.useHomePageDefinitions.label"/> :
+ 1. <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.useHomePageDefinitions.label"/> :
</td>
</tr>
<tr>
@@ -101,9 +102,9 @@
}
%>
<tr>
- <td>1.</td>
+ <td> </td>
<td colspan="2">
- <i><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.homePageDefinitionNotAvailable.label"/></i>
+ 1. <i><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.homePageDefinitionNotAvailable.label"/></i>
</td>
</tr>
<% } %>
@@ -114,11 +115,11 @@
</tr>
<tr>
<td>
- 2.<input type="radio" name="choice" value="sitePage" checked
+ <input type="radio" name="choice" value="sitePage" checked
onclick="javascript:document.mainForm.pageID.focus();">
</td>
<td colspan="2">
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.useOneOfThese.label"/>
<i><b><%=jahiaSite.getTitle()%></b></i> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.sitePages.label"/> :
+ 2. <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.useOneOfThese.label"/>
<i><b><%=jahiaSite.getTitle()%></b></i> <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.sitePages.label"/> :
</td>
</tr>
<tr>
@@ -154,10 +155,10 @@
</tr>
<tr>
<td>
- 3.<input type="radio" name="choice" value="removeHomePage">
+ <input type="radio" name="choice" value="removeHomePage">
</td>
<td colspan="2">
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.removeHomePage.label"/>
+ 3. <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.HomePageTool.removeHomePage.label"/>
</td>
</tr>
<% } %>
@@ -165,14 +166,6 @@
<br>
<table border="0" width="95%" align="center">
<tr>
- <td class="text2">
- <%=message%>
- </td>
- </tr>
-</table>
-<br>
-<table border="0" width="95%" align="center">
- <tr>
<td align="center">
<jahia:jahiaButton img="ok"
href="javascript:submitForm('users', 'homepage', 'process');"
Index: user_create.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_create.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user_create.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ user_create.jsp 11 Oct 2004 16:59:13 -0000 1.2
@@ -9,6 +9,7 @@
<%
HashMap userProperties = (HashMap)request.getAttribute("userProperties");
String defaultHomePage = (String)request.getAttribute("defaultHomePage");
+ String homePageLabel = (String)session.getAttribute("homePageLabel");
%>
<script language="javascript">
@@ -34,16 +35,19 @@
<!-- -->
<form name="mainForm"
action='<%=JahiaAdministration.composeActionURL(request,response,"users","&sub=processCreate")%>'
method="post" onkeydown="javascript:handleKeyCode(event.keyCode);">
<!-- Create new user -->
+ <input type="hidden" name="actionType" value="save" />
<br><br>
<table class="text" border="0" width="80%">
<tr>
<td>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.pleaseOk.label"/><br><br>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.noteThat.label"/> :<br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.userNameUniq.label"/><br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.onlyCharacters.label"/><br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.inputMaxCharacter.label"/><br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.defaultPassword.label"/><br>
+ <ul>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.userNameUniq.label"/></li>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.onlyCharacters.label"/></li>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.inputMaxCharacter.label"/></li>
+ <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.defaultPassword.label"/></li>
+ </ul>
<br>
</td>
</tr>
@@ -125,6 +129,22 @@
</td>
</tr>
<% } %>
+ <tr valign="bottom">
+ <td align="right">
+ <jahia:adminResourceBundle
resourceName="org.jahia.admin.homePage.label"/>
+ </td>
+ <td>
+ <b><%=homePageLabel%></b>
+ <input type="hidden" name="homePageLabel" value="none">
+ <% String homePageURL = "javascript:OpenJahiaScrollableWindow('" +
+
JahiaAdministration.composeActionURL(request,response,"users","&sub=homepage&subaction=display")
+
+ "','SetUserHomePage', 500, 580)"; %>
+ <jahia:jahiaButton img="set"
+ href="<%=homePageURL%>"
+ altBundle="administration"
+
altKey="org.jahia.admin.users.ManageUsers.setHomePage.label" />
+ </td>
+ </tr>
<tr>
<td>
<jahia:jahiaButton img="undoall"
Index: user_edit.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/jsp/jahia/administration/user_management/user_edit.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user_edit.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ user_edit.jsp 11 Oct 2004 16:59:13 -0000 1.2
@@ -43,8 +43,10 @@
<td>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.pleaseOk.label"/><br><br>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.noteThat.label"/> :<br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.removeSpace.label"/><br>
- <li> <jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.inputMaxCharacter.label"/><br>
+ <ul>
+ <li><jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.removeSpace.label"/></li>
+ <li><jahia:adminResourceBundle
resourceName="org.jahia.admin.users.ManageUsers.inputMaxCharacter.label"/></li>
+ </ul>
<br>
</td>
</tr>
@@ -58,6 +60,8 @@
<td>
<!-- This hidden field is here when one will decide that a user
name can be changed -->
<input type="hidden" name="username" value="<%=username%>">
+ <!-- This hidden field can be changed to 'update' so that we keep
the edited data without confirming changes -->
+ <input type="hidden" name="actionType" value="save" />
<b><%=username%></b>
</td>
</tr>
