Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv22137/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
EditUserToGroupAction.java PreferenceAction.java
SearchConditionalUserAction.java
SearchConditionalGroupAction.java GroupForShowVO.java
Added Files:
AddUserToGroupAction.java AddUserToGroupInitAction.java
Log Message:
CMSC-996 The basic files.
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-996
AddUserToGroupAction.java is new
AddUserToGroupInitAction.java is new
Index: EditUserToGroupAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/EditUserToGroupAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- EditUserToGroupAction.java 27 Jul 2008 07:46:37 -0000 1.1
+++ EditUserToGroupAction.java 28 Jul 2008 02:05:26 -0000 1.2
@@ -26,46 +26,64 @@
public ActionForward execute(ActionMapping actionMapping,ActionForm
actionForm, HttpServletRequest request,HttpServletResponse response) throws
Exception {
SearchForm searchform = (SearchForm) actionForm;
- if (null !=
searchform.getOption()&&null!=searchform.getGroupName()) {
+
+ if (null == searchform.getOption() || null ==
searchform.getGroupName()) {
+ return actionMapping.findForward(CANCEL);
+ }
+
String groupName = searchform.getGroupName();
String[] authIds = searchform.getChk_();
- //String forword=request.getParameter("group");
- String forword=searchform.getOption();
+ String forword = searchform.getOption();
+
if ("remove".equals(forword)) {
removeAuthorityFromUser(groupName, authIds);
request.setAttribute("searchform", searchform);
}
if ("add".equals(forword)) {
+
PagingStatusHolder holder =
PagingUtils.getStatusHolder(request);
int totalCount = 0;
- List<Authority> authorities = new ArrayList();
-
if(!StringUtil.isEmptyOrWhitespace(searchform.getGroup())){
- authorities.clear();
+ List<Authority> authorities = new
ArrayList<Authority>();
+
+ if
(!StringUtil.isEmptyOrWhitespace(searchform.getGroup())) {
+ // have conditons searching
+
HashMap map = new HashMap();
map.put("group", searchform.getGroup());
- if (map.size() > 0) {
- authorities =
getAuthorityService().getAssociatedAuthorities(map,
- holder);
- totalCount =
getAuthorityService().getAssociatedAuthoritiesNum(map,
- holder);
- }
- }else{
+
+ authorities =
getAuthorityService().getAssociatedAuthorities(
+ map, holder);
+ totalCount =
getAuthorityService().getAssociatedAuthoritiesNum(
+ map, holder);
+
+ } else {
+ // no conditions search
+ // need authId from the last jsp
StringBuffer userAllId = new
StringBuffer();
- for(String userId:searchform.getChk_()){
- userAllId.append(userId+";");
- }
-
request.getSession().setAttribute("users",userAllId.substring(0,
userAllId.length()-1));
//°Ñ´ÓÉÏÒ»¸öÒ³ÃæÉÏ´«¹ýÀ´µÄÊý×éÁ´½Ó³É×Ö·û´®£¬Ìí¼Óµ½attributeÖÐ
+ for (String authId : searchform.getChk_()) {
+ String userId =
getAuthenticationService()
+
.getAuthenticationById(Long.parseLong(authId))
+ .getUserId();
+ userAllId.append(userId + ";");
+ }
+ request.getSession().setAttribute("users",
+ userAllId.substring(0,
userAllId.length() - 1)); // contact
+
//
string[]
+
authorities =
getAuthorityService().getAllAuthorities(holder);
totalCount =
getAuthorityService().countAllAuthorities();
}
- if(authorities!=null)
- request.setAttribute("groupName", groupName);
- request.setAttribute("groupForShow",
convertAuthrityTOVO(authorities));
+ if (authorities != null) {
+ request.setAttribute("groupForShow",
+
convertAuthrityTOVO(authorities));
+ }
request.setAttribute("totalCount", totalCount);
+ return actionMapping.findForward("add");
+
}
return actionMapping.findForward(forword);
- }
- return actionMapping.findForward(CANCEL);
+
+
}
private void removeAuthorityFromUser(String groupName, String[]
authIds) {
for (String authId : authIds) {
@@ -99,26 +117,4 @@
}
}
- /*private void addAuthorityToUser(String[] groupNames,String[] userIds){
- for(String groupName:groupNames){
- for(String userId:userIds){
-
getAuthenticationService().addAuthorityToUser(userId, groupName);
- }
- }
- }*/
- /*if(request.getAttribute("users")!=null){
- String[] userIds = (String[])request.getAttribute("users");
- SearchForm searchform = (SearchForm)actionForm;
- //String operation=(String)
request.getSession().getAttribute("operation");
- if (null!=(searchform.getChk_group())){
- String[] groupNames = searchform.getChk_group();
- addAuthorityToUser( groupNames, userIds);
- return actionMapping.findForward("user");
- }else if(null!=request.getSession().getAttribute("groupName")){
- String groupName=(String)
request.getSession().getAttribute("groupName");
- removeAuthorityFromUser(groupName,userIds);
- return actionMapping.findForward("group");
- }
-}*/
-
Index: PreferenceAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/PreferenceAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PreferenceAction.java 15 Jul 2008 09:24:31 -0000 1.3
+++ PreferenceAction.java 28 Jul 2008 02:05:26 -0000 1.4
@@ -99,8 +99,11 @@
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder(request);
+
int offset = pagingHolder.getOffset();
int pagesize = pagingHolder.getPageSize();
+ /*pagingHolder.getSort();
+ pagingHolder.getDir();*/
List<PreferenceVO> preferences =
preferenceService.getPreferences(preference, offset,
pagesize, preferenceForm.getOrder(),
preferenceForm.getDirection());
Index: SearchConditionalUserAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalUserAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SearchConditionalUserAction.java 27 Jul 2008 07:46:37 -0000 1.1
+++ SearchConditionalUserAction.java 28 Jul 2008 02:05:26 -0000 1.2
@@ -23,17 +23,15 @@
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.community.person.Person;
-import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.Authority;
public class SearchConditionalUserAction extends AbstractCommunityAction{
+
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request, HttpServletResponse response)
throws Exception{
+
String groupName = request.getParameter("groupName");
SearchForm searchform = (SearchForm) actionForm;
- //get all the conditions which are not null to be used into HQL
- //û°ì·¨ÊÊÓÃbeanutilsÒòΪËüÖ»ÊÇͬΪ¶ÔÏó´«µÝ ²»ÄÜת»»³Émap
- //ËùÒÔÕâÀïÊÖ¹¤À´×öÁË
HashMap map = new HashMap();
if(!StringUtil.isEmptyOrWhitespace(searchform.getFullName())){
map.put("fullname", searchform.getFullName());
@@ -47,13 +45,13 @@
if(!StringUtil.isEmptyOrWhitespace(searchform.getGroups())){
map.put("group", searchform.getGroups());
}
- //////////////////////////
if(!StringUtil.isEmptyOrWhitespace(groupName)){
- //Authority
spiecialAuthority=getAuthorityService().findAuthorityByName(groupName);
+ map.put("group", groupName);
+ }
+ if(!StringUtil.isEmptyOrWhitespace(groupName)){
map.put("group", groupName);
map.put("strict", "strict");
}
- ///////////////////////////////////////
PagingStatusHolder holder =
PagingUtils.getStatusHolder(request);
List<Person> persons;
int totalCount = 0;
@@ -69,13 +67,10 @@
request.setAttribute("personForShow", convertToVO(persons));
request.setAttribute("totalCount", totalCount);
- ///////////////////////////////////////////////////////
if(!StringUtil.isEmptyOrWhitespace(groupName)){
- request.setAttribute("groupName", groupName);
+ request.getSession().setAttribute("groupName", groupName);
return actionMapping.findForward("group");
}
- /////////////////
- //removeFromSession(request, searchform);
return actionMapping.findForward("success");
}
@@ -88,9 +83,7 @@
per.setEmail(p.getEmail());
per.setUsername(getAuthenticationService().getAuthenticationById(p.getAuthenticationId()).getUserId());
String groupsName = "";
- Long authenticationId=p.getAuthenticationId();
- Authentication
authentication=getAuthenticationService().getAuthenticationById(authenticationId);
- Set<String> authorityNames =
getAuthorityService().getAuthorityNamesForUser(authentication.getUserId());
+ Set<String> authorityNames =
getAuthorityService().getAuthorityNamesForUser(getAuthenticationService().getAuthenticationById(p.getAuthenticationId()).getUserId());
if(authorityNames.size()>=1) {
Iterator iter = authorityNames.iterator();
while(iter.hasNext()){
@@ -101,7 +94,6 @@
}else{
per.setGroups("");
}
-
per.setAuthId(p.getAuthenticationId());
perShow.add(per);
}
Index: SearchConditionalGroupAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalGroupAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SearchConditionalGroupAction.java 27 Jul 2008 07:46:37 -0000 1.1
+++ SearchConditionalGroupAction.java 28 Jul 2008 02:05:26 -0000 1.2
@@ -42,6 +42,10 @@
List<GroupForShowVO> relationsVO = new
ArrayList<GroupForShowVO>();
List<Authority> authorities = new ArrayList<Authority>();
PagingStatusHolder holder =
PagingUtils.getStatusHolder(request);
+
+ holder.getSort();
+ holder.getDir();
+
int totalCount = 0;
HashMap map = new HashMap();
Index: GroupForShowVO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupForShowVO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GroupForShowVO.java 27 Jul 2008 07:49:26 -0000 1.1
+++ GroupForShowVO.java 28 Jul 2008 02:05:26 -0000 1.2
@@ -1,4 +1,4 @@
-package com.finalist.cmsc.services.community.domain;
+package com.finalist.cmsc.community.forms;
public class GroupForShowVO {
private String groupName;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
