[Aplaws-commit] r2486 - releases/2.0.0/ccm-cms/src/com/arsdigita/cms

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

Author: pboy
Date: 2013-02-03 12:37:55 +0000 (Sun, 03 Feb 2013)
New Revision: 2486

Modified:
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/Initializer.java
Log:
Backport r2470: Various authoring steps now configurable. (on behalf of JensP)

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig.java	2013-02-03 12:31:30 UTC (rev 2485)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig.java	2013-02-03 12:37:55 UTC (rev 2486)
@@ -84,6 +84,7 @@
 
         return s_config;
     }
+
     /**
      * Storage (map) for method getAssetStepsToSkip(ContentType type) to store
      * mapping of steps that are deemed irrelevant for the passid in type.
@@ -120,7 +121,7 @@
             "/default/folder.jsp");
     /**
      * Path or the root folter for template folders. Path is relative to webapp
-     * root.
+     * root. Modify with care! Usually modified by developers only!
      */
     private final Parameter m_templateRootPath =
                             new StringParameter(
@@ -550,8 +551,7 @@
     private final Parameter m_itemSearchFlatBrowsePanePageSize = new IntegerParameter(
             "com.arsdigita.cms.item_search.flat_browse_pane.page_size",
             Parameter.REQUIRED,
-            20);
-    
+            20);    
     /////////////////////////////////////////////
     // FolderBrowse
     /////////////////////////////////////////////
@@ -606,6 +606,10 @@
             Parameter.REQUIRED,
             50);
    
+   private final Parameter m_attachPersonOrgaUnitsStep = new BooleanParameter(
+            "com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step",
+            Parameter.REQUIRED,
+            Boolean.TRUE);
     
     // ///////////////////////////////////////////
     // publishToFile package related parameter
@@ -708,6 +712,8 @@
 //        register(m_itemSearchFlatBrowsePaneEnable);        
         register(m_itemSearchFlatBrowsePanePageSize);
         
+        register(m_attachPersonOrgaUnitsStep);
+
         loadInfo();
     }
 
@@ -1164,4 +1170,8 @@
          return (Integer) get(m_itemSearchFlatBrowsePanePageSize);
     }
 
+    public Boolean getAttachPersonOrgaUnitsStep() {
+        return (Boolean) get(m_attachPersonOrgaUnitsStep);
+    }
+
 }

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties	2013-02-03 12:31:30 UTC (rev 2485)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties	2013-02-03 12:37:55 UTC (rev 2486)
@@ -294,3 +294,8 @@
 com.arsdigita.cms.image_browser.thumbnail_max_height.purpose=Set the maximum height of the thumbnail in ImageBrowserr
 com.arsdigita.cms.image_browser.thumbnail_max_height.example=150
 com.arsdigita.cms.image_browser.thumbnail_max_height.format=[integer]
+
+com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step.title = Attach PersonOrgaUnits step
+com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step.purpose = Attaches an authoring step to GenericPerson which displays all GenericOrganizationalUnits to which the person is assigned to
+com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step.example = true
+com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step.foramt = [boolean]
\ No newline at end of file

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/Initializer.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/Initializer.java	2013-02-03 12:31:30 UTC (rev 2485)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/Initializer.java	2013-02-03 12:37:55 UTC (rev 2486)
@@ -234,13 +234,14 @@
             FileAsset.BASE_DATA_OBJECT_TYPE,
             new AssetMetadataProvider());
 
-
+        if (s_conf.getAttachPersonOrgaUnitsStep()) {
         AuthoringKitWizard.registerAssetStep(
                 GenericPerson.BASE_DATA_OBJECT_TYPE,
                 GenericPersonOrgaUnitsStep.class,
                 ContenttypesGlobalizationUtil.globalize("person.authoring.orgas.title"),
                 ContenttypesGlobalizationUtil.globalize("person.authoring.orgas.title"),
                 20);
+        }
 
         s_log.debug("CMS.Initializer.init(DomainInitEvent) completed");
     }    //  END init(DomainInitEvent e)