inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configuration changes

Browse Source 
- each wizard now has its own list of types
- made the inline text editing page the default page in create content wizard
- dialog and wizard config is now global
- fixed problem with create content wizard action

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-05-12 11:33:48 +00:00
parent 2120371a7c
commit d6f4146c86
12 changed files with 89 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/extension/web-client-config-custom.xml.sample
View File

@@ -60,7 +60,7 @@
<!-- into the web client, for this to work you will need to --> <!-- into the web client, for this to work you will need to -->
<!-- rename example-model-context.xml.sample to example-model-context.xml --> <!-- rename example-model-context.xml.sample to example-model-context.xml -->
<!-- <!--
<config evaluator="string-compare" condition="Custom Content Types"> <config evaluator="string-compare" condition="Content Wizards">
<content-types> <content-types>
<type name="my:sop" /> <type name="my:sop" />
</content-types> </content-types>

5
config/alfresco/web-client-config-actions.xml
View File

@@ -318,8 +318,7 @@
</permissions> </permissions>
<label-id>create_content</label-id> <label-id>create_content</label-id>
<image>/images/icons/new_content.gif</image> <image>/images/icons/new_content.gif</image>
<action>createContent</action> <action>wizard:createContent</action>
<action-listener>#{CreateContentWizard.startWizard}</action-listener>
</action> </action>
<!-- Create space --> <!-- Create space -->
@@ -330,7 +329,6 @@
<label-id>create_space</label-id> <label-id>create_space</label-id>
<image>/images/icons/create_space.gif</image> <image>/images/icons/create_space.gif</image>
<action>dialog:createSpace</action> <action>dialog:createSpace</action>
<!-- <action-listener>#{NewSpaceDialog.startWizard}</action-listener> -->
</action> </action>
<!-- Create Advanced Space Wizard --> <!-- Create Advanced Space Wizard -->
@@ -341,7 +339,6 @@
<label-id>advanced_space_wizard</label-id> <label-id>advanced_space_wizard</label-id>
<image>/images/icons/create_space.gif</image> <image>/images/icons/create_space.gif</image>
<action>wizard:createSpace</action> <action>wizard:createSpace</action>
<!-- <action-listener>#{NewSpaceWizard.startWizard}</action-listener> -->
</action> </action>
<!-- Manage Space Users --> <!-- Manage Space Users -->

2
config/alfresco/web-client-config-dialogs.xml
View File

@@ -1,6 +1,6 @@
<alfresco-config> <alfresco-config>
<config evaluator="string-compare" condition="Dialogs"> <config>
<dialog-container>/jsp/dialog/container.jsp</dialog-container> <dialog-container>/jsp/dialog/container.jsp</dialog-container>
<dialogs> <dialogs>

5
config/alfresco/web-client-config-wizards.xml
View File

@@ -1,6 +1,6 @@
<alfresco-config> <alfresco-config>
<config evaluator="string-compare" condition="Wizards"> <config>
<wizard-container>/jsp/wizard/container.jsp</wizard-container> <wizard-container>/jsp/wizard/container.jsp</wizard-container>
<wizards> <wizards>
@@ -144,12 +144,11 @@
description-id="create_content_step2_desc" description-id="create_content_step2_desc"
instruction-id="default_instruction" /> instruction-id="default_instruction" />
</condition> </condition>
<condition if="#{CreateContentWizard.mimeType == 'text/plain'}"> <!-- Default to the inline text editor -->
<page path="/jsp/content/create-content-wizard/create-text.jsp" <page path="/jsp/content/create-content-wizard/create-text.jsp"
title-id="create_content_step2_title" title-id="create_content_step2_title"
description-id="create_content_step2_desc" description-id="create_content_step2_desc"
instruction-id="default_instruction" /> instruction-id="default_instruction" />
</condition>
</step> </step>
<step name="summary" title-id="summary" description-id="summary_step_description"> <step name="summary" title-id="summary" description-id="summary_step_description">
<page path="/jsp/wizard/summary.jsp" <page path="/jsp/wizard/summary.jsp"

31
config/alfresco/web-client-config.xml
View File

@@ -160,31 +160,41 @@
</advanced-search> </advanced-search>
</config> </config>
<config evaluator="string-compare" condition="Custom Content Types"> <config evaluator="string-compare" condition="Space Wizards">
<content-types> <!-- The list of custom folder types to show in the advanced space wizard -->
<type name="cm:dictionaryModel"/>
</content-types>
</config>
<config evaluator="string-compare" condition="Custom Folder Types">
<folder-types> <folder-types>
<type name="fm:forums" icon="/images/icons/forums.gif" description-id="forums_desc" /> <type name="fm:forums" icon="/images/icons/forums.gif" description-id="forums_desc" />
</folder-types> </folder-types>
</config> </config>
<config evaluator="string-compare" condition="Content Wizards"> <config evaluator="string-compare" condition="Content Wizards">
<other-properties user-choice-visible="true" user-choice-default="true" /> <!-- The list of custom content types to show in the content wizards -->
<content-types>
<type name="cm:dictionaryModel"/>
</content-types>
<!-- The list of mime types that can be created inline -->
<create-mime-types> <create-mime-types>
<mime-type name="text/html" /> <mime-type name="text/html" />
<mime-type name="text/plain" /> <mime-type name="text/plain" />
</create-mime-types> </create-mime-types>
<!-- Controls the message regarding property editing after the content is created -->
<other-properties user-choice-visible="true" user-choice-default="true" />
</config> </config>
<config evaluator="string-compare" condition="Action Wizards"> <config evaluator="string-compare" condition="Action Wizards">
<types> <!-- The list of types shown in the is-subtype condition -->
<subtypes>
<type name="folder" display-label-id="space"/> <type name="folder" display-label-id="space"/>
<type name="content"/> <type name="content"/>
</types> </subtypes>
<!-- The list of content types shown in the specialise-type action -->
<specialise-types>
<type name="cm:dictionaryModel"/>
</specialise-types>
<!-- The list of aspects to show in the add/remove features action -->
<!-- and the has-aspect condition -->
<aspects> <aspects>
<aspect name="generalclassifiable"/> <aspect name="generalclassifiable"/>
<aspect name="complianceable"/> <aspect name="complianceable"/>
@@ -196,6 +206,7 @@
<aspect name="translatable"/> <aspect name="translatable"/>
<aspect name="localizable"/> <aspect name="localizable"/>
</aspects> </aspects>
<!-- The list of transformers to show in the transform actions -->
<transformers> <transformers>
<transformer name="text/html"/> <transformer name="text/html"/>
<transformer name="application/pdf"/> <transformer name="application/pdf"/>

63
source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
View File

@@ -52,8 +52,6 @@ public class AlfrescoNavigationHandler extends NavigationHandler
public final static String CLOSE_WIZARD_OUTCOME = WIZARD_PREFIX + "close"; public final static String CLOSE_WIZARD_OUTCOME = WIZARD_PREFIX + "close";
protected final static String CONFIG_NAV_BEAN = "NavigationBean"; protected final static String CONFIG_NAV_BEAN = "NavigationBean";
protected final static String CONFIG_DIALOGS = "Dialogs";
protected final static String CONFIG_WIZARDS = "Wizards";
protected String dialogContainer = null; protected String dialogContainer = null;
protected String wizardContainer = null; protected String wizardContainer = null;
@@ -252,8 +250,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
/** /**
* Returns the dialog configuration object for the given dialog name. * Returns the dialog configuration object for the given dialog name.
* If there is a node in the dispatch context a lookup is performed using * If there is a node in the dispatch context a lookup is performed using
* the node. If this doesn't return any config or there is no dispatch * the node otherwise the global config section is used.
* context node a 'global' dialog lookup is performed.
* *
* *
* @param name The name of dialog being launched * @param name The name of dialog being launched
@@ -265,24 +262,19 @@ public class AlfrescoNavigationHandler extends NavigationHandler
DialogConfig dialogConfig = null; DialogConfig dialogConfig = null;
ConfigService configSvc = Application.getConfigService(context); ConfigService configSvc = Application.getConfigService(context);
Config config = null;
if (dispatchContext != null) if (dispatchContext != null)
{ {
Config config = configSvc.getConfig(dispatchContext); // use the node to perform the lookup (this will include the global section)
if (config != null) config = configSvc.getConfig(dispatchContext);
{
DialogsConfigElement dialogsCfg = (DialogsConfigElement)config.getConfigElement(
DialogsConfigElement.CONFIG_ELEMENT_ID);
if (dialogsCfg != null)
{
dialogConfig = dialogsCfg.getDialog(name);
}
} }
else
{
// just use the global
config = configSvc.getGlobalConfig();
} }
// if we didn't find a dialog via the dispatch look it up in the 'global' dialogs config
if (dialogConfig == null)
{
Config config = configSvc.getConfig(CONFIG_DIALOGS);
if (config != null) if (config != null)
{ {
DialogsConfigElement dialogsCfg = (DialogsConfigElement)config.getConfigElement( DialogsConfigElement dialogsCfg = (DialogsConfigElement)config.getConfigElement(
@@ -292,7 +284,6 @@ public class AlfrescoNavigationHandler extends NavigationHandler
dialogConfig = dialogsCfg.getDialog(name); dialogConfig = dialogsCfg.getDialog(name);
} }
} }
}
return dialogConfig; return dialogConfig;
} }
@@ -300,7 +291,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
/** /**
* Returns the wizard configuration object for the given wizard name. * Returns the wizard configuration object for the given wizard name.
* If there is a node in the dispatch context a lookup is performed using * If there is a node in the dispatch context a lookup is performed using
* the node otherwise a 'global' wizard lookup is performed. * the node otherwise the global config section is used.
* *
* @param name The name of wizard being launched * @param name The name of wizard being launched
* @param dispatchContext The node being acted upon * @param dispatchContext The node being acted upon
@@ -311,24 +302,19 @@ public class AlfrescoNavigationHandler extends NavigationHandler
WizardConfig wizardConfig = null; WizardConfig wizardConfig = null;
ConfigService configSvc = Application.getConfigService(context); ConfigService configSvc = Application.getConfigService(context);
Config config = null;
if (dispatchContext != null) if (dispatchContext != null)
{ {
Config config = configSvc.getConfig(dispatchContext); // use the node to perform the lookup (this will include the global section)
if (config != null) config = configSvc.getConfig(dispatchContext);
{
WizardsConfigElement wizardsCfg = (WizardsConfigElement)config.getConfigElement(
WizardsConfigElement.CONFIG_ELEMENT_ID);
if (wizardsCfg != null)
{
wizardConfig = wizardsCfg.getWizard(name);
}
} }
else
{
// just use the global
config = configSvc.getGlobalConfig();
} }
// if we didn't find a dialog via the dispatch look it up in the 'global' wizards config
if (wizardConfig == null)
{
Config config = configSvc.getConfig(CONFIG_WIZARDS);
if (config != null) if (config != null)
{ {
WizardsConfigElement wizardsCfg = (WizardsConfigElement)config.getConfigElement( WizardsConfigElement wizardsCfg = (WizardsConfigElement)config.getConfigElement(
@@ -338,7 +324,6 @@ public class AlfrescoNavigationHandler extends NavigationHandler
wizardConfig = wizardsCfg.getWizard(name); wizardConfig = wizardsCfg.getWizard(name);
} }
} }
}
return wizardConfig; return wizardConfig;
} }
@@ -354,11 +339,11 @@ public class AlfrescoNavigationHandler extends NavigationHandler
if (this.dialogContainer == null) if (this.dialogContainer == null)
{ {
ConfigService configSvc = Application.getConfigService(context); ConfigService configSvc = Application.getConfigService(context);
Config dialogsConfig = configSvc.getConfig(CONFIG_DIALOGS); Config globalConfig = configSvc.getGlobalConfig();
if (dialogsConfig != null) if (globalConfig != null)
{ {
this.dialogContainer = dialogsConfig.getConfigElement("dialog-container").getValue(); this.dialogContainer = globalConfig.getConfigElement("dialog-container").getValue();
} }
} }
@@ -376,11 +361,11 @@ public class AlfrescoNavigationHandler extends NavigationHandler
if (this.wizardContainer == null) if (this.wizardContainer == null)
{ {
ConfigService configSvc = Application.getConfigService(context); ConfigService configSvc = Application.getConfigService(context);
Config wizardsConfig = configSvc.getConfig(CONFIG_WIZARDS); Config globalConfig = configSvc.getGlobalConfig();
if (wizardsConfig != null) if (globalConfig != null)
{ {
this.wizardContainer = wizardsConfig.getConfigElement("wizard-container").getValue(); this.wizardContainer = globalConfig.getConfigElement("wizard-container").getValue();
} }
} }

20
source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
View File

@@ -306,12 +306,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find aspects configuration element"); logger.warn("Could not find 'aspects' configuration element");
} }
} }
else else
{ {
logger.warn("Could not find Action Wizards configuration section"); logger.warn("Could not find 'Action Wizards' configuration section");
} }
} }
@@ -334,10 +334,10 @@ public abstract class BaseActionWizard extends BaseWizardBean
// add any configured content sub-types to the list // add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types"); Config wizardCfg = svc.getConfig("Action Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types"); ConfigElement typesCfg = wizardCfg.getConfigElement("specialise-types");
if (typesCfg != null) if (typesCfg != null)
{ {
for (ConfigElement child : typesCfg.getChildren()) for (ConfigElement child : typesCfg.getChildren())
@@ -373,12 +373,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find 'content-types' configuration element"); logger.warn("Could not find 'specialise-types' configuration element");
} }
} }
else else
{ {
logger.warn("Could not find 'Custom Content Types' configuration section"); logger.warn("Could not find 'Action Wizards' configuration section");
} }
} }
@@ -456,12 +456,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find transformers configuration element"); logger.warn("Could not find 'transformers' configuration element");
} }
} }
else else
{ {
logger.warn("Could not find Action Wizards configuration section"); logger.warn("Could not find 'Action Wizards' configuration section");
} }
} }
@@ -509,12 +509,12 @@ public abstract class BaseActionWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find image-transformers configuration element"); logger.warn("Could not find 'image-transformers' configuration element");
} }
} }
else else
{ {
logger.warn("Could not find Action Wizards configuration section"); logger.warn("Could not find 'Action Wizards' configuration section");
} }
} }

4
source/java/org/alfresco/web/bean/content/BaseContentWizard.java
View File

@@ -246,7 +246,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// add any configured content sub-types to the list // add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types"); Config wizardCfg = svc.getConfig("Content Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types"); ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
@@ -305,7 +305,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find 'Custom Content Types' configuration section"); logger.warn("Could not find 'Content Wizards' configuration section");
} }
} }

6
source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
View File

@@ -243,7 +243,7 @@ public class CreateRuleWizard extends BaseActionWizard
Config wizardCfg = svc.getConfig("Action Wizards"); Config wizardCfg = svc.getConfig("Action Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("types"); ConfigElement typesCfg = wizardCfg.getConfigElement("subtypes");
if (typesCfg != null) if (typesCfg != null)
{ {
this.modelTypes = new ArrayList<SelectItem>(); this.modelTypes = new ArrayList<SelectItem>();
@@ -277,12 +277,12 @@ public class CreateRuleWizard extends BaseActionWizard
} }
else else
{ {
logger.warn("Could not find types configuration element"); logger.warn("Could not find 'subtypes' configuration element");
} }
} }
else else
{ {
logger.warn("Could not find Action Wizards configuration section"); logger.warn("Could not find 'Action Wizards' configuration section");
} }
} }

4
source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
View File

@@ -470,7 +470,7 @@ public class CreateSpaceWizard extends BaseWizardBean
// add any configured content sub-types to the list // add any configured content sub-types to the list
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()). Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types"); getConfig("Space Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types"); ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -548,7 +548,7 @@ public class CreateSpaceWizard extends BaseWizardBean
} }
else else
{ {
logger.warn("Could not find 'Custom Folder Types' configuration section"); logger.warn("Could not find 'Space Wizards' configuration section");
} }
} }

4
source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
View File

@@ -499,7 +499,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
// add any configured content sub-types to the list // add any configured content sub-types to the list
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types"); Config wizardCfg = svc.getConfig("Content Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types"); ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
@@ -558,7 +558,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
} }
else else
{ {
logger.warn("Could not find 'Custom Content Types' configuration section"); logger.warn("Could not find 'Content Wizards' configuration section");
} }
} }

4
source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
View File

@@ -558,7 +558,7 @@ public class NewSpaceWizard extends AbstractWizardBean
// add any configured content sub-types to the list // add any configured content sub-types to the list
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()). Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types"); getConfig("Space Wizards");
if (wizardCfg != null) if (wizardCfg != null)
{ {
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types"); ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -624,7 +624,7 @@ public class NewSpaceWizard extends AbstractWizardBean
} }
else else
{ {
logger.warn("Could not find 'Custom Folder Types' configuration section"); logger.warn("Could not find 'Space Wizards' configuration section");
} }
} }