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

Daily merge.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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
ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance());
Config wizardCfg = svc.getConfig("Custom Content Types");
Config wizardCfg = svc.getConfig("Content Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
@@ -558,7 +558,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean
}
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
Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()).
getConfig("Custom Folder Types");
getConfig("Space Wizards");
if (wizardCfg != null)
{
ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
@@ -624,7 +624,7 @@ public class NewSpaceWizard extends AbstractWizardBean
}
else
{
logger.warn("Could not find 'Custom Folder Types' configuration section");
logger.warn("Could not find 'Space Wizards' configuration section");
}
}

11
source/java/org/alfresco/web/bean/wizard/WizardManager.java
View File

@@ -115,6 +115,17 @@ public class WizardManager
return this.currentWizardConfig.getIcon();
}
/**
* Returns the error message to use in error conditions
*
* @return The error message
*/
public String getErrorMessage()
{
return Application.getMessage(FacesContext.getCurrentInstance(),
this.currentWizardConfig.getErrorMessageId());
}
/**
* Returns the resolved title to use for the wizard
*