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.2 to HEAD (V2.1 sourced fixes)

Browse Source 
7121: Merged V2.1 to V2.2
      7049: Fix for unreported duplicate component ID error (very rarely seen) in browse WCM sandbox JSP
      7058: Fixes failure to rollback correctly on failed alfresco->alfresco deployment.
      7074: Added filtering/access control checks to the AVM virtualization view.
      7083: Added transaction handling to calls involving preview store
      7084: xmlsec library update to 1.4.1
      7092: Missing config update from the AVM filtering checkin.
   7124: Merged V2.1 to V2.2
      7091: Fix to several issues found with Regenerate Renditions wizard and FormsService
   7125: Merged V2.1 to V2.2
      7093: Fixes to workaround some deployment issues being experienced by a customer.
      7094: Fix for previous build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-13 02:41:28 +00:00
parent 83919a08f1
commit f6ae19f3f5
7 changed files with 149 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/bean/wcm/DeploySnapshotDialog.java
View File

@@ -116,7 +116,14 @@ public class DeploySnapshotDialog extends BaseDialogBean
NodeRef report = ref.getChildRef();
String server = (String)this.nodeService.getProperty(report, WCMAppModel.PROP_DEPLOYSERVER);
int version = (Integer)this.nodeService.getProperty(report, WCMAppModel.PROP_DEPLOYVERSION);
int version = -1;
Serializable snapshotObj = nodeService.getProperty(report, WCMAppModel.PROP_DEPLOYVERSION);
if (snapshotObj != null && snapshotObj instanceof Integer)
{
version = (Integer)snapshotObj;
}
if ((version == this.versionToDeploy && selectedDeployTo.contains(server)) ||
(version != this.versionToDeploy) || (allDeployToServers.contains(server) == false))
{