inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2E to HEAD

Browse Source 
17355: Fix for ETHREEOH-2894 - TinyMCE html source edits are not persisted in some cases within forms
   17360: Fixed IE error when rendering site and container pickers
   17364: IE6 layout fix for DocLib toolbar and long filenames. Follow-up fix for r17360. Fix workflow pop-up.
   17370: Fixed ETHREEOH-2926 "There is no restriction that's why layout is broken."
      - new title limit is 256
      - also moved Configure link to the toolbar as for the ret of the dashlets
      - title words that are longer than the column are hidden (for all dashlets)
   17371: Fixed styling in all themes for sites & search menu that was changed a bit after the last focus/accessability changes
   17374: ETHREEOH-2513 - Null Pointer if log level is DEBUG
   17376: Fixed ETHREEOH-2920 "Spaces are not trimmed in the string entered into Search User/Group field"
   17379: Fixed ETHREEOH-1722 & ETHREEOH-1723 - subject & message must contain characters 
      - ETHREEOH-1722 "It is possible to send e-mail with Subject that consists of spaces"
      - ETHREEOH-1723 "It is possible to send e-mail with empty Message field"
   17382: Merged DEV-TEMPORARY to V3.2
      16735: ETHREEOH-1382: It's impossible to find files with short names on Staging Sandbox
             - User friendly message "Not enough information was entered to perform a search, at least one value must be entered or alocation selected to search within. Text fields require a minimum of 3 characters"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-19 11:03:44 +00:00
parent 85e4c0dbf1
commit 8e594817c3
3 changed files with 98 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1225,10 +1225,6 @@ public class AVMBrowseBean implements IContextListener
String query = this.searchContext.buildQuery(getMinimumSearchLength());
if (query == null)
{
// failed to build a valid query, the user probably did not enter the
// minimum text required to construct a valid search
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
BrowseBean.MSG_SEARCH_MINIMUM), new Object[] {getMinimumSearchLength()}));
this.folders = Collections.<Map>emptyList();
this.files = Collections.<Map>emptyList();
return;
@@ -1987,6 +1983,14 @@ public class AVMBrowseBean implements IContextListener
this.searchContext = searchContext;
resetFileFolderLists();
if (searchContext.buildQuery(getMinimumSearchLength()) == null)
{
// failed to build a valid query, the user probably did not enter the
// minimum text required to construct a valid search
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
BrowseBean.MSG_SEARCH_MINIMUM), new Object[] {getMinimumSearchLength()}));
}
}
}

5
source/web/jsp/users/email-space-users.jsp
View File

@@ -45,7 +45,8 @@
{
if (okEnabled)
{
if (document.getElementById("dialog:dialog-body:subject").value.length == 0)
if (document.getElementById("dialog:dialog-body:subject").value.trim().length == 0 ||
document.getElementById("dialog:dialog-body:message").value.trim().length == 0)
{
document.getElementById("dialog:finish-button").disabled = true;
}
@@ -91,7 +92,7 @@
</h:panelGrid>
<h:outputText value="#{msg.message}:"/>
<h:inputTextarea value="#{DialogManager.bean.mailHelper.body}" rows="4" cols="75" disabled="#{DialogManager.bean.mailHelper.usingTemplate != null}" />
<h:inputTextarea id="message" value="#{DialogManager.bean.mailHelper.body}" rows="4" cols="75" disabled="#{DialogManager.bean.mailHelper.usingTemplate != null}" onkeyup="javascript:checkButtonState();" />
</h:panelGrid>
</a:panel>

16
source/web/scripts/ajax/xforms.js
View File

@@ -4762,11 +4762,23 @@ alfresco.constants.TINY_MCE_DEFAULT_SETTINGS =
add_form_submit_trigger: false,
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_buttons1: "",
theme_advanced_buttons1: "fullscreen,table",
theme_advanced_buttons2: "",
theme_advanced_buttons3: "",
urlconverter_callback: "alfresco_TinyMCE_urlconverter_callback",
file_browser_callback: "alfresco_TinyMCE_file_browser_callback"
file_browser_callback: "alfresco_TinyMCE_file_browser_callback",
setup : function(ed)
{
// Fix for issue in browsers where content is not saved after fullscreen mode is toggled off
ed.onSetContent.add(function(ed, o) {
//if fullscreen plugin is available and o has these values, then we're coming out of fullscreen mode only
if ((ed.settings.plugins.indexOf('fullscreen')!=-1) && o.set && o.format==='raw' && o.initial===undefined)
{
alfresco.xforms.RichTextEditor.currentInstance._commitValueChange(alfresco.xforms.RichTextEditor.currentInstance.getValue());
}
});
}
};
tinyMCE.init($extend({}, alfresco.constants.TINY_MCE_DEFAULT_SETTINGS));