[Aplaws-commit] r2423 - in releases/2.0.0: ccm-cms/src/com/arsdigita/cms/ui/workflow ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui

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

Author: pboy
Date: 2012-12-18 22:28:18 +0000 (Tue, 18 Dec 2012)
New Revision: 2423

Modified:
   releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
Log:
Fixed Cancel dialogue to add roles, fixed wizard in article   (on behalf of JensP)

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java	2012-12-18 21:43:41 UTC (rev 2422)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java	2012-12-18 22:28:18 UTC (rev 2423)
@@ -53,8 +53,8 @@
 import java.util.TooManyListenersException;
 
 class TaskAddRole extends CMSForm {
+
     private final TaskRequestLocal m_task;
-
     private final OptionGroup m_roles;
     private final Submit m_add;
     private final Submit m_cancel;
@@ -90,6 +90,7 @@
     }
 
     private class InitListener implements FormInitListener {
+
         public final void init(final FormSectionEvent e)
                 throws FormProcessException {
             final PageState state = e.getPageState();
@@ -104,29 +105,35 @@
 
             m_roles.setValue(state, list.toArray());
         }
+
     }
 
     private class ProcessListener implements FormProcessListener {
+
         public final void process(final FormSectionEvent e)
                 throws FormProcessException {
             final PageState state = e.getPageState();
-            final CMSTask task = m_task.getTask(state);
+            if (m_add.isSelected(state)) {
+                final CMSTask task = m_task.getTask(state);
 
-            task.removeAllGroupAssignees();
+                task.removeAllGroupAssignees();
 
-            final String[] roles = (String[]) m_roles.getValue(state);
+                final String[] roles = (String[]) m_roles.getValue(state);
 
-            if (roles != null) {
-                for (int i = 0; i < roles.length; i++) {
-                    task.assignGroup(new Group(new BigDecimal(roles[i])));
+                if (roles != null) {
+                    for (int i = 0; i < roles.length; i++) {
+                        task.assignGroup(new Group(new BigDecimal(roles[i])));
+                    }
                 }
+
+                task.save();
             }
+        }
 
-            task.save();
-        }
     }
 
     private class SubmissionListener implements FormSubmissionListener {
+
         public final void submitted(final FormSectionEvent e)
                 throws FormProcessException {
             final PageState state = e.getPageState();
@@ -134,15 +141,16 @@
 
             if (!sm.canAccess(state.getRequest(),
                               SecurityManager.WORKFLOW_ADMIN)) {
-                throw new FormProcessException
-                    (lz(("cms.ui.workflow.insufficient_privileges")));
+                throw new FormProcessException(lz(("cms.ui.workflow.insufficient_privileges")));
             }
         }
+
     }
 
     private class RoleOptionPrintListener extends DataQueryOptionPrintListener {
+
         public static final String QUERY_NAME =
-            "com.arsdigita.cms.getStaffRoles";
+                                   "com.arsdigita.cms.getStaffRoles";
 
         public RoleOptionPrintListener() {
             super();
@@ -163,8 +171,9 @@
         }
 
         public String getValue(DataQuery d) {
-            return (String)d.get("name");
+            return (String) d.get("name");
         }
+
     }
 
     private static GlobalizedMessage gz(final String key) {
@@ -174,4 +183,5 @@
     private static String lz(final String key) {
         return (String) gz(key).localize();
     }
+
 }

Modified: releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
===================================================================
--- releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java	2012-12-18 21:43:41 UTC (rev 2422)
+++ releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java	2012-12-18 22:28:18 UTC (rev 2423)
@@ -66,6 +66,7 @@
      */
     public ArticlePropertyForm(ItemSelectionModel itemModel, ArticlePropertiesStep step) {
         super(itemModel, step);
+        m_step = step;
         addSubmissionListener(this);
     }