mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
12297: Fix mysql config instructions for case sensitive user names - DOC-68 12298: Merged V2.2 to V3.0 12257: Fixed ETWOTWO-952: MLText properties not intercepted when calling addAspect and createNode 12270: Fixed RhinoScriptTest to propogate exceptions for full recording by Junit 12271: Fixed NPE in ML interceptor when null node properties are passed to createNode 12282: Merged V2.1 to V2.2 11616: Fix for ETWOONE-218: Common.js function needs to be changed to support root context 12287: Merged V2.1 to V2.2 12229: WCM - disable/hide link validation by defrault (ETWOONE-106, ETWOONE-392) 12301: Merged V2.2 to V3.0 12288: Merged V2.1 to V2.2 12233: Fixed ETWOONE-124: Add the property UUIDBinding to ImporterBootstrap git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1341,6 +1341,22 @@ public class AVMBrowseBean implements IContextListener
|
||||
return AVMUtil.isMainStore(this.sandbox);
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicates whether link validation is available (virtualization server is accessible).
|
||||
* It can be used in the 'rendered' attribute in some tags.
|
||||
* @see org.alfresco.linkvalidation.LinkValidationServiceImpl#isLinkValidationDisabled()
|
||||
*
|
||||
* @return TRUE if link validation is ENABLED (virtualization server IS ACCESSIBLE)
|
||||
*/
|
||||
public boolean getLinkValidationEnabled()
|
||||
{
|
||||
boolean enabled = !linkValidationService.isLinkValidationDisabled();
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Link validation enabled:" + String.valueOf(enabled).toUpperCase());
|
||||
}
|
||||
return enabled;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Action event handlers
|
||||
|
@@ -102,7 +102,7 @@ public class SubmitDialog extends BaseDialogBean
|
||||
private String[] workflowSelectedValue;
|
||||
private boolean enteringExpireDate = false;
|
||||
private boolean loadSelectedNodesFromBrowseBean = false;
|
||||
private boolean validateLinks = true;
|
||||
private boolean validateLinks = false;
|
||||
private boolean autoDeploy = false;
|
||||
private Date defaultExpireDate;
|
||||
private Date launchDate;
|
||||
@@ -289,7 +289,7 @@ public class SubmitDialog extends BaseDialogBean
|
||||
this.defaultExpireDate = new Date();
|
||||
this.workflowSelectedValue = null;
|
||||
this.launchDate = null;
|
||||
this.validateLinks = true;
|
||||
this.validateLinks = this.avmBrowseBean.getLinkValidationEnabled();
|
||||
this.autoDeploy = false;
|
||||
this.workflowParams = null;
|
||||
this.sandboxInfo = null;
|
||||
@@ -826,6 +826,17 @@ public class SubmitDialog extends BaseDialogBean
|
||||
this.autoDeploy = autoDeploy;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return linkValidationEnabled flag to indicate whether link validation is turned on
|
||||
* and virtualization server is available.
|
||||
*
|
||||
*/
|
||||
public boolean getLinkValidationEnabled()
|
||||
{
|
||||
return this.avmBrowseBean.getLinkValidationEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return List of UIListItem object representing the available workflows for the website
|
||||
*/
|
||||
|
@@ -139,7 +139,7 @@
|
||||
</td>
|
||||
<td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td>
|
||||
<td align=right>
|
||||
<a:actionLink id="actLinks" value="#{msg.check_links}" image="/images/icons/run_link_validation.gif"
|
||||
<a:actionLink id="actLinks" rendered="#{AVMBrowseBean.linkValidationEnabled}" value="#{msg.check_links}" image="/images/icons/run_link_validation.gif"
|
||||
actionListener="#{DialogManager.setupParameters}" action="dialog:linkValidation"
|
||||
rendered="#{AVMBrowseBean.linkValidationEnabled}">
|
||||
<f:param name="store" value="#{AVMBrowseBean.stagingStore}" />
|
||||
|
@@ -90,7 +90,7 @@
|
||||
</h:panelGrid>
|
||||
|
||||
<h:panelGrid columns="2" cellspacing="0" cellpadding="2" style="margin-left: 20px; margin-top: 6px;"
|
||||
rendered="#{DialogManager.bean.workflowListSize != 0}">
|
||||
rendered="#{DialogManager.bean.workflowListSize != 0 && DialogManager.bean.linkValidationEnabled == true}">
|
||||
<h:selectBooleanCheckbox id="links-chkbox" value="#{DialogManager.bean.validateLinks}" />
|
||||
<h:outputText value="#{msg.check_links} (#{msg.check_links_info})" escape="false" />
|
||||
</h:panelGrid>
|
||||
|
@@ -63,7 +63,14 @@ function handleErrorYahoo(e)
|
||||
*/
|
||||
function setContextPath(contextPath)
|
||||
{
|
||||
if (window.location.pathname.indexOf(contextPath) == 0 )
|
||||
{
|
||||
_alfContextPath = contextPath;
|
||||
}
|
||||
else
|
||||
{
|
||||
_alfContextPath = "";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user