Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv3537/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
SearchConditionalUserAction.java UserAddAction.java
UserAddInitAction.java
Log Message:
change newsletter publication could search, sort defaultly, CMSC-979 change
staticSearch with more columns. remove the unuse function
NewletterPublication,make the addUser turn to correct pages
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-979
Index: SearchConditionalUserAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- SearchConditionalUserAction.java 5 Aug 2008 05:44:37 -0000 1.13
+++ SearchConditionalUserAction.java 19 Sep 2008 10:32:02 -0000 1.14
@@ -53,6 +53,8 @@
int totalCount = personService.getAssociatedPersonsNum(map);
setSharedAttributes(request, persons, totalCount);
+ String forwardPath = (String)
actionMapping.findForward("newUserLinkBack").getPath();
+ request.setAttribute("forwardPath", forwardPath);
return actionMapping.findForward("success");
}
@@ -80,7 +82,7 @@
return actionMapping.findForward("group");
}
-private void chooseOption(HttpServletRequest request, String option,
Map<String, String> map, String groupName, String[] authIds) {
+ private void chooseOption(HttpServletRequest request, String option,
Map<String, String> map, String groupName, String[] authIds) {
//String option = searchform.getOption();
if (null != authIds&&"remove".equals(option)) {
removeAuthorityFromUser(groupName, authIds);
@@ -100,7 +102,7 @@
String TransFormNames=StringUtils.join(userNames,"','");
map.put("strict", TransFormNames);
}
-}
+ }
public ActionForward searchCandidateSubscriber(ActionMapping
actionMapping, ActionForm actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
Index: UserAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- UserAddAction.java 5 Aug 2008 07:56:06 -0000 1.10
+++ UserAddAction.java 19 Sep 2008 10:32:02 -0000 1.11
@@ -73,11 +73,9 @@
return ret;
} else {
if ("newslettersubscribers".equals(tmpForward)) {
- ActionForward ret = new
ActionForward(actionMapping
-
.findForward("newslettersubscribers").getPath()
- + "?newsletterId="
- +
httpServletRequest.getSession().getAttribute(
-
"newsletterId"));
+ String path = (String)
httpServletRequest.getSession()
+ .getAttribute("path");
+ ActionForward ret = new ActionForward(path);
clearSession(httpServletRequest.getSession());
ret.setRedirect(true);
return ret;
@@ -112,6 +110,12 @@
ret.setRedirect(true);
return ret;
}
+ /*else if("addToGroup".equals(tmpForward)){
+ ActionForward ret =
actionMapping.findForward("addToGroup");
+ clearSession(httpServletRequest.getSession());
+ ret.setRedirect(true);
+ return ret;
+ }*/
}
removeFromSession(httpServletRequest, actionForm);
return actionMapping.findForward(SUCCESS);
@@ -136,10 +140,10 @@
ret = new ActionForward(path);
}
else {
- ret = new
ActionForward("/editors/newsletter/NewsletterPublicationSubscriberSearch.do?newsletterId="
- +
httpServletRequest.getSession().getAttribute("newsletterId"));
- }
+ String path = (String)
httpServletRequest.getSession().getAttribute("path");
+ ret = new ActionForward(path);
ret.setRedirect(true);
+ }
} else {
ret = actionMapping.findForward(SUCCESS);
}
Index: UserAddInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddInitAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- UserAddInitAction.java 5 Aug 2008 07:56:06 -0000 1.9
+++ UserAddInitAction.java 19 Sep 2008 10:32:02 -0000 1.10
@@ -59,11 +59,12 @@
private void setNewsletterForward(HttpServletRequest request) {
if (StringUtils.isNotBlank(request.getParameter("forward"))) {
- request.getSession().setAttribute("newsletterId",
request.getParameter("newsletterId"));
- request.getSession().setAttribute("forward",
request.getParameter("forward"));
- //community preference return back
- if(request.getParameter("path") != null) {
- request.getSession().setAttribute("path",
request.getParameter("path"));
+ request.getSession().setAttribute("forward",
+ request.getParameter("forward"));
+ // community preference return back
+ if (request.getParameter("path") != null) {
+ request.getSession().setAttribute("path",
+ request.getParameter("path"));
}
}
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
