Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory james.mmbase.org:/tmp/cvs-serv1424

Modified Files:
        PreferenceAction.java 
Log Message:
CMSC-944,Create overview screen for Community Preferences


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-944


Index: PreferenceAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/PreferenceAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PreferenceAction.java       10 Jun 2008 11:53:11 -0000      1.1
+++ PreferenceAction.java       11 Jun 2008 03:10:53 -0000      1.2
@@ -36,7 +36,6 @@
       PreferenceForm preferenceForm = (PreferenceForm)form;
       PreferenceVO preference= new PreferenceVO();
       BeanUtils.copyProperties(preference, preferenceForm);
-      preferenceForm.reset(mapping, request);
       setNull(preferenceForm);
       preferenceService.createPreference(preference);
       request.setAttribute("isAddSuccess", "true");
@@ -62,13 +61,14 @@
    public ActionForward init(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response)
          throws Exception {
+      PreferenceForm preferenceForm = (PreferenceForm)form;
+      setNull(preferenceForm);
       return mapping.findForward("success");
    }
    
    public ActionForward delete(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response)
          throws Exception {
-      PreferenceForm preferenceForm = (PreferenceForm)form;
       String id = request.getParameter("id");
       if(id != null) {
          preferenceService.deletePreference(id);
@@ -99,8 +99,15 @@
       }
       List<PreferenceVO> preferences = 
preferenceService.getPreferences(preference, 
Integer.parseInt(preferenceForm.getOffset())*pageSize, 
pageSize,preferenceForm.getOrder(),preferenceForm.getDirection());
       int totalCount = preferenceService.getTotalCount(preference) ;
-      request.setAttribute("totalCount", totalCount);
       request.setAttribute("offset", preferenceForm.getOffset());
+      if(preferences == null || preferences.size() ==0) {
+         if(Integer.parseInt(preferenceForm.getOffset()) >= 1) {
+            preferences = preferenceService.getPreferences(preference, 
(Integer.parseInt(preferenceForm.getOffset())-1)*pageSize, 
pageSize,preferenceForm.getOrder(),preferenceForm.getDirection());
+            request.setAttribute("offset", 
(Integer.parseInt(preferenceForm.getOffset())-1));
+            
preferenceForm.setOffset(String.valueOf((Integer.parseInt(preferenceForm.getOffset())-1)));
+         }
+      }
+      request.setAttribute("totalCount", totalCount);
       request.setAttribute("results", preferences);
       request.setAttribute("isList", "true");
       return mapping.findForward("success");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to