[Aplaws-commit] r2483 - in releases/2.0.0/ccm-cms/src/com/arsdigita/cms: contenttypes/ui/panels ui/authoring

[<pb...@fe...>]

Author: pboy
Date: 2013-02-03 09:43:44 +0000 (Sun, 03 Feb 2013)
New Revision: 2483

Modified:
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java
Log:
Backport r2462 (Lenght of property Name restricted, minor bugfixes, fixed paginator) (on behalf of JensP)

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java	2013-02-03 09:12:51 UTC (rev 2482)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java	2013-02-03 09:43:44 UTC (rev 2483)
@@ -36,8 +36,7 @@
                      final int pageSize) {
         final String pageNumberStr = request.getParameter(PAGE_NUMBER);
         if (pageNumberStr == null) {
-            logger.debug("No pageNumber parameter in request setting page number"
-                         + " to 1.");
+            logger.debug("No pageNumber parameter in request setting page number to 1.");
             pageNumber = 1;
         } else {
             pageNumber = Integer.parseInt(pageNumberStr);
@@ -99,6 +98,18 @@
                                    getEnd()));
         query.setRange(getBegin(), getEnd() + 1);
     }        
+    
+    public <T> List<T> applyListLimits(final List<T> list, final Class<T> type) {
+        int begin = getBegin() - 1;
+        if (begin < 0) {
+            begin = 0;
+        }
+        int end = getEnd();
+        if (end >= list.size()) {
+            end = list.size();
+        }
+        return list.subList(begin, end);
+    }
 
     public int getPageCount() {
         return (int) Math.ceil((double) objectCount / (double) pageSize);

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java	2013-02-03 09:12:51 UTC (rev 2482)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java	2013-02-03 09:43:44 UTC (rev 2483)
@@ -144,7 +144,7 @@
         final Hidden id = new Hidden(CONTENT_ITEM_ID);
          //final TextField id = new TextField(CONTENT_ITEM_ID);
         add(id);
-
+        
         // JavaScript auto-name generation is off by default.
         // It is turned on under the following circumstances
         //
@@ -179,11 +179,13 @@
         add(new Label(getNameLabel()));
         TextField nameWidget = new TextField(new TrimmedStringParameter(NAME));
         nameWidget.addValidationListener(new NameValidationListener());
+        nameWidget.setMaxLength(190);
         nameWidget.setOnFocus("defaulting = false");
         nameWidget.setOnBlur(
                 "if (this.value == '') "
                 + "{ defaulting = true; this.value = urlize(this.form." + TITLE
                 + ".value) } " + " else { this.value = urlize(this.value); }");
+        nameWidget.addValidationListener(new NotNullValidationListener());        
         add(nameWidget);
 
     }

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java	2013-02-03 09:12:51 UTC (rev 2482)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java	2013-02-03 09:43:44 UTC (rev 2483)
@@ -142,6 +142,8 @@
 
     @Override
     public void validate(final FormSectionEvent fse) throws FormProcessException {
+        super.validate(fse);
+        
         final ContentItem item = getItemSelectionModel().getSelectedItem(fse.getPageState());
         ACSObject parent = item.getParent();