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.0 to HEAD

Browse Source 
12734: Fix for ETHREEOH-1007
   12735: Fix for ALFCOM-2326 (applied to 3.0E original code location)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-14 14:05:43 +00:00
parent 2c9e18b13b
commit e132d0d832
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
View File

@@ -28,9 +28,11 @@ import javax.faces.context.FacesContext;
import org.alfresco.web.app.Application;
/**
* Dialog supporting the Upload New Version action on a working copy node.
*/
public class UploadNewVersionDialog extends DoneEditingDialog
{
private final static String MSG_UPLOAD_NEW_VERSION = "upload_new_version";
private final static String MSG_OF = "of";
@@ -52,7 +54,6 @@ public class UploadNewVersionDialog extends DoneEditingDialog
return property.getFile() == null;
}
@Override
public String getContainerTitle()
{
@@ -63,8 +64,15 @@ public class UploadNewVersionDialog extends DoneEditingDialog
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
property.setKeepCheckedOut(!finishedEditing);
return checkinFileOK(context, outcome);
if (finishedEditing)
{
property.setKeepCheckedOut(false);
return checkinFileOK(context, outcome);
}
else
{
return updateFileOK(context, outcome);
}
}
@Override
@@ -73,5 +81,4 @@ public class UploadNewVersionDialog extends DoneEditingDialog
super.resetState();
finishedEditing = false;
}
}