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 
13304: Final part of I18N fixes for Share. TinyMCE editor lang packs: fr, de, jp, es. Added Spanish (es) to web-client TinyMCE integration also which was missing it.
   13316: Liferay Portal 4.3.X fixes for JSF Client portlet:
           - Tested deployment instructions for Alfresco and Liferay 4.3.X - still work as per wiki page http://wiki.alfresco.com/wiki/Deploying_2.1WAR_Liferay4.3
           - Upload is working (tested from Add Content, Upload New Version and Update)
           - Fixed bug raised in ETHREEOH-1170
          NOTE: there are still issues with the other Ajax Mootools powered portlets...
   13333: Fix for ETHREEOH-1410, ETHREEOH-1402, ETHREEOH-1396, ETHREEOH-1393, ETHREEOH-1380, ETHREEOH-1274, ETHREEOH-1266, ETHREEOH-1257 - Paging control submit box now correctly handles enter key press without submitting parent form.
   13348: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes.
          So they are not accidently given full permissions to that folder or the ability to rename it later.
   13349: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes [missed files]
   13350: Fix for ETHREEOH-971. CIFS and WebDav online edit modes fixed to work in IE as best as possible in FF.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-12 11:19:13 +00:00
parent 2bc702e125
commit b906c50cdf
27 changed files with 995 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,9 @@ public class CreateUserWizard extends BaseWizardBean
private static Log logger = LogFactory.getLog(BaseWizardBean.class);
protected static final String ERROR = "error_person";
protected static final String ERROR_DOMAIN_MISMATCH = "error_domain_mismatch";
private static final String MSG_ERROR_NEWUSER_HOME_SPACE = "error_newuser_home_space";
protected static final String QUOTA_UNITS_KB = "kilobyte";
protected static final String QUOTA_UNITS_MB = "megabyte";
protected static final String QUOTA_UNITS_GB = "gigabyte";
@@ -751,7 +753,7 @@ public class CreateUserWizard extends BaseWizardBean
{
// Admin Authority has full permissions by default (automatic - set in the permission config)
// give full permissions to the new user
getPermissionService().setPermission(homeSpaceRef, this.userName, getPermissionService().getAllPermission(), true);
getPermissionService().setPermission(homeSpaceRef, this.userName, getPermissionService().getAllPermission(), true);
// by default other users will only have GUEST access to the space contents
// or whatever is configured as the default in the web-client-xml config
@@ -815,8 +817,12 @@ public class CreateUserWizard extends BaseWizardBean
}
else if (this.homeSpaceLocation != null)
{
// set to existing
homeSpaceNodeRef = homeSpaceLocation;
// set to existing - first ensure it is NOT "User Homes" space!
if (this.defaultHomeSpaceRef.equals(this.homeSpaceLocation))
{
throw new AlfrescoRuntimeException(Application.getMessage(context, MSG_ERROR_NEWUSER_HOME_SPACE));
}
homeSpaceNodeRef = this.homeSpaceLocation;
setupHomeSpacePermissions(homeSpaceNodeRef);
}
else
@@ -866,7 +872,8 @@ public class CreateUserWizard extends BaseWizardBean
outcome = null;
}
if (outcome == null) {
if (outcome == null)
{
this.isFinished = false;
}
@@ -887,15 +894,15 @@ public class CreateUserWizard extends BaseWizardBean
{
if (quota != null)
{
if (quota >= 0L)
{
quota = convertToBytes(quota, quotaUnits);
}
else
{
// ignore negative quota
return;
}
if (quota >= 0L)
{
quota = convertToBytes(quota, quotaUnits);
}
else
{
// ignore negative quota
return;
}
}
getContentUsageService().setUserQuota(userName, (quota == null ? -1 : quota));