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

Browse Source 
13371: Fix for ETHREEOH-1371, ETHREEOH-1373, ETHREEOH-1374.
          Rule comparator now correctly deals with MLTEXT datatype fields such as name/title/description.
   13372: Fix for ETHREEOH-1291.
          Fixes the general issue that "decodeURI()" should not be used to decode javascript encoded strings -unless- you specifically want to ignore certain characters, "unescape()" should be used instead.
   13373: Fix for ETHREEOH-1284. Clean up of generated javascript for UIDataPager component - also moved to include file for performance and ease of modification.
   13384: Fix for ETHREEOH-1459.
          Sweep through and clean up of the Edit Online/Offline editing and Checkin/Checkout process as per latest wireframes.
          A number of minor fixes to JSF action evaluators and related JSPs also.
          Icons updated as per wires.
   13396: Fix for ETHREEOH-1424. Web-framework script connector now generates an Accept-Language header based on current user locale by default for remote calls.
   13404: Missing paging controls added to task and workflow dialogs (part of ETHREEOH-1410).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-12 12:04:24 +00:00
parent 2152123239
commit c172eba346
39 changed files with 259 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/web/bean/coci/DoneEditingDialog.java
View File

@@ -47,13 +47,13 @@ import org.alfresco.web.ui.common.Utils;
*/
public class DoneEditingDialog extends CheckinCheckoutDialog
{
private final static String MSG_DONE = "done";
private static final String MSG_CHECK_IN = "check_in";
private final static String MSG_OK = "ok";
private static final String MSG_DONE_EDITING = "done_editing";
private final static String MSG_MISSING_ORIGINAL_NODE = "missing_original_node";
private final static String DIALOG_NAME = AlfrescoNavigationHandler.DIALOG_PREFIX + "doneEditingFile";
/**
* this flag indicates occurrence when source node isn't versionable, but working copy yet is versionable
*/
@@ -95,7 +95,7 @@ public class DoneEditingDialog extends CheckinCheckoutDialog
/**
* @return Returns true if source node for selected working copy founded
*/
public boolean isSourceFounded()
public boolean isSourceFound()
{
return (sourceNodeRef != null);
}
@@ -132,28 +132,30 @@ public class DoneEditingDialog extends CheckinCheckoutDialog
{
sourceNodeRef = getSourceNodeRef(node.getNodeRef());
if (sourceNodeRef != null)
{
sourceVersionable = getNodeService().hasAspect(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
}
}
}
@Override
public String getFinishButtonLabel()
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DONE);
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_OK);
}
@Override
public boolean getFinishButtonDisabled()
{
return !isSourceFounded();
return !isSourceFound();
}
@Override
public String getContainerTitle()
{
if (isSourceFounded())
if (isSourceFound())
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CHECK_IN) + " '" + getNodeService().getProperty(sourceNodeRef, ContentModel.PROP_NAME) + "'";
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DONE_EDITING) + " '" + getNodeService().getProperty(sourceNodeRef, ContentModel.PROP_NAME) + "'";
}
else
{
@@ -183,7 +185,7 @@ public class DoneEditingDialog extends CheckinCheckoutDialog
*/
private String getCurrentVersionLabel()
{
if (isSourceFounded())
if (isSourceFound())
{
Version curVersion = property.getVersionQueryService().getCurrentVersion(sourceNodeRef);
return curVersion.getVersionLabel();