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

Merged V2.1 to HEAD

Browse Source 
6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down.
   6439: Fix for WCM-619 & WCM-571
   6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324.
   6442: Fix for WCM-621 (reviewer can not view or run links report)
   6443: Fix for AWC-1488. Dashboard
   6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project.
   6445: Icons for use in fix for WCM-522
   6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 22:07:27 +00:00
parent a8023d20a2
commit 97b5b391c8
18 changed files with 271 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.web.bean.wcm;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
@@ -70,6 +71,7 @@ public class LinkValidationDialog extends BaseDialogBean
private String webapp;
private String webappPath;
private String initialTab;
private String title;
private NodeRef webappPathRef;
private boolean runningReport = false;
private boolean update = false;
@@ -118,6 +120,28 @@ public class LinkValidationDialog extends BaseDialogBean
this.compareToStaging = true;
}
// work out title for dialog by examining store type
FacesContext context = FacesContext.getCurrentInstance();
if (this.avmService.getStoreProperty(this.store,
SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN) != null)
{
String pattern = Application.getMessage(context, "link_validaton_dialog_title_user");
String user = this.store.substring(
this.store.indexOf(AVMUtil.STORE_SEPARATOR)+AVMUtil.STORE_SEPARATOR.length());
this.title = MessageFormat.format(pattern,
new Object[] {user});
}
else if (this.avmService.getStoreProperty(this.store,
SandboxConstants.PROP_SANDBOX_STAGING_MAIN) != null)
{
this.title = Application.getMessage(context, "link_validaton_dialog_title_staging");
}
else if (this.avmService.getStoreProperty(this.store,
SandboxConstants.PROP_SANDBOX_WORKFLOW_MAIN) != null)
{
this.title = Application.getMessage(context, "link_validaton_dialog_title_workflow");
}
if (logger.isDebugEnabled())
{
if (this.runningReport)
@@ -155,6 +179,12 @@ public class LinkValidationDialog extends BaseDialogBean
return null;
}
@Override
public String getContainerTitle()
{
return this.title;
}
@Override
public boolean getFinishButtonDisabled()
{