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 V3.2 to HEAD

Browse Source 
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
   16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
   16757: Merged DEV-TEMPORARY to V3.2
      16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
      16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
      16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
   16761: Merged DEV-TEMPORARY to V3.2
      16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
   16762: Displaying error title when error text is displayed
   16763: Merged DEV-TEMPORARY to V3.2
      16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-14 11:08:21 +00:00
parent 94f41494f6
commit ba3f9629b5
7 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -1060,9 +1060,9 @@ public class AVMBrowseBean implements IContextListener
public boolean getIsManagerRole()
{
Node wpNode = getWebsite();
if (wpNode != null)
if (wpNode != null && nodeService.exists(wpNode.getNodeRef()))
{
return getWebProjectService().isContentManager(wpNode.getNodeRef());
return getWebProjectService().isContentManager(wpNode.getNodeRef());
}
return false;
}
@@ -1070,7 +1070,7 @@ public class AVMBrowseBean implements IContextListener
public boolean getIsManagerOrPublisherRole()
{
Node wpNode = getWebsite();
if (wpNode != null)
if (wpNode != null && nodeService.exists(wpNode.getNodeRef()))
{
User user = Application.getCurrentUser(FacesContext.getCurrentInstance());
String userRole = getWebProjectService().getWebUserRole(wpNode.getNodeRef(), user.getUserName());
@@ -1095,7 +1095,6 @@ public class AVMBrowseBean implements IContextListener
this.showAllSandboxes = value;
}
/**
* @return true if the website has had a deployment attempt
*/
@@ -1112,14 +1111,21 @@ public class AVMBrowseBean implements IContextListener
Map request = context.getExternalContext().getRequestMap();
if (request.get(REQUEST_BEEN_DEPLOYED_RESULT) == null)
{
// see if there are any deployment attempts for the staging area
NodeRef webProjectRef = this.getWebsite().getNodeRef();
String store = (String)getNodeService().getProperty(webProjectRef,
if (!nodeService.exists(this.getWebsite().getNodeRef()))
{
result = false;
}
else
{
// see if there are any deployment attempts for the staging area
NodeRef webProjectRef = this.getWebsite().getNodeRef();
String store = (String)getNodeService().getProperty(webProjectRef,
WCMAppModel.PROP_AVMSTORE);
List<NodeRef> deployAttempts = DeploymentUtil.findDeploymentAttempts(store);
// add a placeholder object in the request so we don't evaluate this again for this request
result = new Boolean(deployAttempts != null && deployAttempts.size() > 0);
List<NodeRef> deployAttempts = DeploymentUtil.findDeploymentAttempts(store);
// add a placeholder object in the request so we don't evaluate this again for this request
result = new Boolean(deployAttempts != null && deployAttempts.size() > 0);
}
request.put(REQUEST_BEEN_DEPLOYED_RESULT, result);
}
else