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.0 to HEAD

Browse Source 
12251: Fix for wiki parsing regression
  12253: More regression fixes in wiki parser
  12255: Update Share web session timeout value to 60 minutes.
  12289: Share wiki - ETHREEOH-1021, ETHREEOH-1022, ETHREEOH-880, ETHREEOH-1032
  12290: Additional to r12289
  12344: Fix for ETHREEOH-1066 - Wiki page editing no longer broken for page titles that don't exist yet.
  12355: ETHREEOH-984: External users in Share cannot edit profile
  12359: Fixed typo in Flash/HTML uploader type selection
  12364: ETHREEOH-1032 - Impossibility to delete Wiki page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-23 12:23:50 +00:00
parent 9cff0c89db
commit 0405e3adbb
4 changed files with 128 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/web/scripts/invite/Invite.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowException;
@@ -100,6 +101,7 @@ public class Invite extends DeclarativeWebScript
private WorkflowService workflowService;
private PersonService personService;
private AuthenticationService authenticationService;
private PermissionService permissionService;
private MutableAuthenticationDao mutableAuthenticationDao;
private SiteService siteService;
private NodeService nodeService;
@@ -214,6 +216,16 @@ public class Invite extends DeclarativeWebScript
this.namespaceService = namespaceService;
}
/**
* Set the permission service
*
* @param permissionService the permission service
*/
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
}
/*
* (non-Javadoc)
*
@@ -419,11 +431,13 @@ public class Invite extends DeclarativeWebScript
properties.put(ContentModel.PROP_LASTNAME, inviteeLastName);
properties.put(ContentModel.PROP_EMAIL, inviteeEmail);
final String finalUserName = inviteeUserName;
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
{
personService.createPerson(properties);
NodeRef person = personService.createPerson(properties);
permissionService.setPermission(person, finalUserName, PermissionService.ALL_PERMISSIONS, true);
return null;
}