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.4-BUG-FIX to HEAD

Browse Source 
30270: ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
   30306: Fixed ALF-7384: Xam: XamArchiveCleaner can delete files before retention period has passed
    - Keep the NOW upper limit to the query
    - Add a double-check using Java code to precisely check (down to the ms) that the retention time has passed
   30308: Merged V3.4 to V3.4-BUG-FIX
      30307: ALF-10186: Fix up all code that expects it can cast a WebScriptRequest directly into a WebScriptServletRequest
   30310: ALF-5830 show_audit.ftl template doesn't work any more
      - Changes to support new audit api
      - Works with high level content auditing
   30337: Merge DEV to V3.4-BUG-FIX
     30160 :  ALF-9257 - Renaming web project cause no trigger of the autodeploy process
   30362: ALF-10227 Add space after ''{0}'' in text
   30395: Removed deep svn:mergeinfo
   30433: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30424: ALF-8941: WCM: Virtual server setting lazyDeployExperimentalOnly ="true" (as per si3 fix) fails to load library under WEB-INF/lib directory (for HTTP filter).
         Walk up by hierarchy to the root and deploys a context if it wasn't deployed yet, through invocation of updateAllVirtualWebapps recursively. 
   30454: Fixed ALF-9158: Assignment of workflow task is not proper - out-of-the-box WCM workflow
   30466: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30460: ALF-9424 : Webform(XSD): xf:switch switch group does not work based on "complexContent with Base" element.
         Schema2XForms and SchemaUtil were modified to allow correctly process elements with namespace that differ from "http://www.w3.org/2001/XMLSchema"
   30476: Merged DEV to V3.4-BUG-FIX
      30474: ALF-10021: Get the last node in the resultset outside the timing loop to force prefetch.
   30483: Fixed ALF-9417: (pdf2swf) Share preview is blank with some pdf files.
   30514: ALF-240: Unfriendly error appears when trying to view details for created discussion for multilingual content   
      Webdav URLs were not valid for non-ML or ML discussion items, but were only stopping the details page for the ML items from being shown. Utils.generateURL now returns null for such items.   
   30517: Fixed ALF-5526: Component-Generator for d:noteref and other "system" types always disabled => breaks extensibility
   30519: FileFolderService moveFrom method was not supported by MLTranslationInterceptor
   30527: ALF-240: added missing exception message.
   30531: Fixed ALF-9599: Share forms do not allow edit of non-cm:content nodes
   30541: ALF-9424: Missed change, causing compilation error
   30552: Tests to accompany fix for ALF-240, ALF-10298: discussion topic webdav URLs causing error page in explorer.
   30565: Fixed ALF-10336 "Drag and Drop item in Customize Site Dashboard - text of item reverts to default font style and size during drag operation"
   30568: Fixed ALF-10342: ClassCastException on org.alfresco.repo.copy.AbstractCopyBehaviourCallback
   30570: ALF-3332: (circa 2008) Pagination inks rewritten incorrectly by opensearch proxy
   30574: ALF-9470: OwnableService cache not being updated for archived nodes - modified fix by Pavel
   30579: ALF-5607: Cancelling of install. Some directories are not deleted from disk.
   - Fixed provided by Bitrock for Mac and Windows
   30583: Merged HEAD to V3.4-BUG-FIX (Back ported 2 fixes for included resource handling when running unit tests)
      28711: Avoid a NPE on certain kinds missing included resources, and instead give a helpful error along the lines of other include issues
      28716: When loading JS includes with a full classpath reference, handle the Eclipse classloader behaving slightly differently on absolute paths compared to the JVM one
   30648: Fixed ALF-10401: No simple way to disable auto-versioning behaviour
    - Added property: version.store.enableAutoVersioning=true
    - When set to 'false', the VersionableAspect will not respond to any events;
      even if the aspect is present, it will not create versions.
   30657: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30590: ALF-7105: pdfbox returns errors in the logs but one cannot understand what file is affected (PDFBox)
         Level log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal was introduced in log4j.properties.
   30669: Fixes: ALF-6470 (Updates FR translation)
   30686: ALF-1017: Fixed compilation error in backport
   30696: Fix for ALF-8176
   30708: ALF-10040: Added missing ReferenceCountingReadOnlyIndexReaderFactory wrapper to IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader() to make it consistent with IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader(String, Set<String>, boolean) and allow SingleFieldSelectors to make it through from LeafScorer to the path caches! Affects ALL Lucene queries that run OUTSIDE of a transaction.
   30722: Fixed ALF-9465: Share: We can add category in Share, but the selected value will not be shown in U.I.
   30724: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_09_05 to BRANCHES/DEV/V3.4-BUG-FIX:
      30603: ALF-10165: Unexpected behaviour when title duplicated between web forms
   30754: Fix for ALF-9899 Huge share site migration, add group to site and user access site related performance issue.
   - generic performance improvements for PATH queries ending "..../*" - specifically to improve listing calendar items for users in many share sites
   30765: Fix for ALF-760 - import loses category association data  
   30779: Merged V3.4 to V3.4-BUG-FIX
      30716: ALF-10452 It's impossible to edit existing user details
         - Change for ALF-371 did not handle the simplest case - no change of home folder location
      30549: Fixes ALF-9534 - Location API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-09-26 18:24:09 +00:00
parent 22d1167ea1
commit babaa0b65c
16 changed files with 173 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/web/bean/users/CreateUserWizard.java
View File

@@ -683,21 +683,27 @@ public class CreateUserWizard extends BaseWizardBean
*
* @param locationId Parent location
* @param spaceName Home space to create, can be null to simply return the parent
* @param oldHomeFolderRef the previous home space, for the case where the the user is being updated.
* It may not have changed.
* @param error True to throw an error if the space already exists, else ignore and return
* @return ID of the home space
*/
protected NodeRef createHomeSpace(String locationId, String spaceName, boolean error)
protected NodeRef createHomeSpace(String locationId, String spaceName, NodeRef oldHomeFolderRef, boolean error)
{
NodeRef homeSpaceNodeRef = null;
if (spaceName != null && spaceName.length() != 0)
{
NodeRef parentRef = new NodeRef(Repository.getStoreRef(), locationId);
// check for existance of home space with same name - return immediately
// check for existence of home space with same name - return immediately
// if it exists or throw an exception an give user chance to enter another name
NodeRef childRef = this.getNodeService().getChildByName(parentRef, ContentModel.ASSOC_CONTAINS, spaceName);
if (childRef != null)
{
if (childRef.equals(oldHomeFolderRef))
{
return oldHomeFolderRef;
}
if (error)
{
throw new AlfrescoRuntimeException("A Home Space with the same name already exists.");
@@ -799,7 +805,7 @@ public class CreateUserWizard extends BaseWizardBean
{
// create properties for Person type from submitted Form data
Map<QName, Serializable> props = new HashMap<QName, Serializable>(7, 1.0f);
setPersonPropertiesAndCreateHomeSpaceIfNeeded(props, context);
setPersonPropertiesAndCreateHomeSpaceIfNeeded(props, null, context);
// create the node to represent the Person
getPersonService().createPerson(props);
@@ -846,7 +852,7 @@ public class CreateUserWizard extends BaseWizardBean
}
protected void setPersonPropertiesAndCreateHomeSpaceIfNeeded(
Map<QName, Serializable> props, FacesContext context)
Map<QName, Serializable> props, NodeRef oldHomeFolderRef, FacesContext context)
{
props.put(ContentModel.PROP_USERNAME, this.userName);
props.put(ContentModel.PROP_FIRSTNAME, this.firstName);
@@ -856,7 +862,7 @@ public class CreateUserWizard extends BaseWizardBean
{
// create new
props.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, "userHomesHomeFolderProvider");
homeSpaceNodeRef = createHomeSpace(this.homeSpaceLocation.getId(), this.homeSpaceName, true);
homeSpaceNodeRef = createHomeSpace(this.homeSpaceLocation.getId(), this.homeSpaceName, oldHomeFolderRef, true);
}
else if (this.homeSpaceLocation != null)
{