Daily merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent 1250a0352c
commit 1dd2a7b72b
67 changed files with 1364 additions and 389 deletions

View File

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