From 46ad69964e03b30feee3fdf266eabf3988f3c1a0 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Sun, 9 Dec 2012 21:26:09 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20BRANCHES/DEV/V4.1-BUG-FIX=20to=20HEAD?= =?UTF-8?q?=20=20=20=2044359:=20Fix=20for=20ALF-15236=20-=20JSF=20-=20Edit?= =?UTF-8?q?=20online=20of=20html=20files=20does=20not=20keep=20the=20forma?= =?UTF-8?q?tting=20=20=20=2044365:=20Fix=20for=20ALF-14653=20-=20Share=20-?= =?UTF-8?q?=20Page=20link=20created=20wrongly=20in=20wiki=20=20=20=2044366?= =?UTF-8?q?:=20Fix=20for=20ALF-15435=20-=20Incorrect=20behavior=20while=20?= =?UTF-8?q?managing=20groups=20via=20Explorer=20=20=20=2044370:=20Completi?= =?UTF-8?q?on=20of=20existing=20fix=20for=20ALF-14568.=20Also=20a=20build?= =?UTF-8?q?=20fix.=20=20=20=2044372:=20Fix=20for=20ALF-13192=20Rules=20fro?= =?UTF-8?q?m=20first=20folder=20move=20to=20second=20when=20delete=20first?= =?UTF-8?q?=20folder.=20=20=20=20=20=20=20=20=20=20=20This=20bug=20was=20c?= =?UTF-8?q?aused=20because=20up=20to=20now,=20all=20rules=20have=20been=20?= =?UTF-8?q?firing=20for=20system=20folders,=20which=20they=20shouldn't=20h?= =?UTF-8?q?ave=20been.=20=20=20=2044381:=20ALF-17094:=20Merged=20V4.1.1=20?= =?UTF-8?q?=20(4.1.1.14)=20to=20V4.1-BUG-FIX=20(4.1.3)=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20<<=20Code=20is=20actually=20as=20suggested=20by?= =?UTF-8?q?=20Derek=20rather=20than=20code=20on=20V4.1.1=20>>=20=20=20=20?= =?UTF-8?q?=20=20=2044291:=20MNT-222=20InvalidNodeRefException=20on=20user?= =?UTF-8?q?=20deletion=20in=20Share=20UI=20=20=20=2044385:=20Fix=20for=20A?= =?UTF-8?q?LF-16006=20-=20MT:=20Document=20Library=20is=20absent=20after?= =?UTF-8?q?=20upgrade=20from=203.4.x=20to=204.1.x=20(eg.=203.4.10=20->=204?= =?UTF-8?q?.1.1)=20=20=20=20=20=20=20=20=20=20=20Offshore=20team=20identif?= =?UTF-8?q?ied=20that=20patches=20running=20outside=20of=20a=20TXN=20were?= =?UTF-8?q?=20returning=20an=20empty=20list=20of=20tenants=20for=20MT=20up?= =?UTF-8?q?grades=20=20=20=20=20=20=20=20=20=20=20-=20fixed=20after=20chat?= =?UTF-8?q?=20to=20Derek=20=E2=80=93=20added=20a=20new=20"big"=20TenantAdm?= =?UTF-8?q?inService=20with=20a=20TXN=20wrapper=20interceptor=20so=20the?= =?UTF-8?q?=20AbstractPatch=20method=20that=20generates=20the=20list=20of?= =?UTF-8?q?=20tenants=20will=20also=20have=20a=20txn=20support=20regardles?= =?UTF-8?q?s=20of=20the=20config=20set=20for=20a=20particularly=20patch=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20-=20merged=20in=20fix=20to=20AVMT?= =?UTF-8?q?oADM=20store=20patch=20to=20respect=20tenant=20named=20objects?= =?UTF-8?q?=20in=20paths=20=20=20=2044395:=20Fix=20for=20ALF-17061=20Searc?= =?UTF-8?q?h=20is=20failing=20with=20Node=20does=20not=20exist:=20missing:?= =?UTF-8?q?//missing/missing(null)=20=20=20=2044402:=20Merged=20DEV=20to?= =?UTF-8?q?=20V4.1-BUG-FIX=20=20=20=20=20=20=2044347:=20ALF-16866=20:=20Fa?= =?UTF-8?q?ilure=20when=20trying=20to=20login=20as=20tenant=20created=20on?= =?UTF-8?q?=203.4.0=20after=20the=20upgrade=20from=203.4.0=20to=204.1.2=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20The=20immutableEntityTransactionalCa?= =?UTF-8?q?che=20was=20made=20not=20tenant=20aware,=20and=20fixUserQNames?= =?UTF-8?q?=20patch=20now=20runs=20after=20migrateTenantsFromAttrsToTable?= =?UTF-8?q?=20to=20fix=20tenant=20users,=20too.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/groups/GroupsDialog.java | 7 ++++--- .../web/jsp/content/create-content-wizard/create-html.jsp | 4 ++-- source/web/jsp/content/edit-html-inline.jsp | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java index 8e1255a7d8..0ae0bae8d3 100644 --- a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java +++ b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java @@ -448,10 +448,11 @@ public class GroupsDialog extends BaseDialogBean } else { - if (search != null && search.startsWith("*")) + boolean immediate = (this.filterMode.equals(FILTER_CHILDREN)); + if ((search != null && search.startsWith("*")) || immediate) { - // if the search term starts with a wildcard use Lucene based search to find groups (results will be inconsistent) - boolean immediate = (this.filterMode.equals(FILTER_CHILDREN)); + // if the search term starts with a wildcard or is for immediate children only then use Solr/Lucene based search query to find groups (note: + // results will be eventually consistent if using Solr, rather than embedded Lucene) Set results = this.authService.findAuthorities(AuthorityType.GROUP, this.group, immediate, search, AuthorityService.ZONE_APP_DEFAULT); authorities = new ArrayList(results); } diff --git a/source/web/jsp/content/create-content-wizard/create-html.jsp b/source/web/jsp/content/create-content-wizard/create-html.jsp index d1c302a39b..9477a28c17 100644 --- a/source/web/jsp/content/create-content-wizard/create-html.jsp +++ b/source/web/jsp/content/create-content-wizard/create-html.jsp @@ -42,10 +42,10 @@ theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1_add : "fontselect,fontsizeselect", - theme_advanced_buttons2_add : "separator,forecolor,backcolor", + theme_advanced_buttons2_add : "separator,forecolor", theme_advanced_buttons3_add_before : "tablecontrols,separator", theme_advanced_disable: "styleselect", - extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]" + extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style],p[align]" }); function saveContent(id, content) diff --git a/source/web/jsp/content/edit-html-inline.jsp b/source/web/jsp/content/edit-html-inline.jsp index 286c6c6514..d62a79567a 100644 --- a/source/web/jsp/content/edit-html-inline.jsp +++ b/source/web/jsp/content/edit-html-inline.jsp @@ -45,10 +45,10 @@ tinyMCE.init({ theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1_add : "fontselect,fontsizeselect", - theme_advanced_buttons2_add : "separator,forecolor,backcolor", + theme_advanced_buttons2_add : "separator,forecolor", theme_advanced_buttons3_add_before : "tablecontrols,separator", theme_advanced_disable: "styleselect", - extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]" + extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style],p[align]" }); function saveContent(id, content)