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 
18305: Fixed merge of fix for ETHREEOH-1619 from V3.1
   18366: Hide Delete button as fix for ETHREEOH-3917
           - Corrected UI to use correct DELETE method call  - but it has not been fully implemented on the repository side...
   18401: Fix for ETHREEOH-4076
   18413: Fix for ETHREEOH-3284
   18511: *RECORD ONLY* Fix for ETHREEOH-4162
   19120: *RECORD ONLY* ALF-1958 - AbstractWebScript improvements to allow scripts that exit due to a JavaScript exception to set the status code and message
   19144: *RECORD ONLY* Added PRE tag to whitelist of safe tags for HTML stripping in Share.
   19194: Fix for ALF-1950 - corrected handling of site URL names starting with an ISO9075 encoded character in Share search data webscript.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-03-11 12:17:43 +00:00
parent 477e9d61a1
commit 4b0ba5644c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/bean/wcm/AVMEditBean.java
View File

@@ -285,7 +285,7 @@ public class AVMEditBean extends BaseDialogBean
public String getContainerTitle()
{
FacesContext fc = FacesContext.getCurrentInstance();
return Application.getMessage(fc, MSG_APPLY_RSS_FEED) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getAvmNode().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
return Application.getMessage(fc, MSG_UPDATE) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE) + getAvmNode().getName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
}
@Override

2
source/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
View File

@@ -397,7 +397,7 @@ public class DatePickerRenderer extends BaseRenderer
outputAttribute(out, component.getAttributes().get("disabled"), "disabled");
}
outputAttribute(out, clientId, "id");
out.write(" onkeyup=\"checkOkButtonState();\" onchange=\"checkOkButtonState();\"");
out.write(" onkeyup=\"checkButtonState();\" onchange=\"checkButtonState();\"");
}
else
{