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

. Delete Website implemented

Browse Source 
- removes staging store, preview stores and associated user stores before removing the website node itself
. Content Reviewer permissions definition fix
. Useful summary page info added to Create Website wizard

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-10-04 15:53:17 +00:00
parent 82e76ede01
commit 7116697960
7 changed files with 131 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
View File

@@ -405,25 +405,13 @@ public abstract class InviteUsersWizard extends AbstractWizardBean
if (authType == AuthorityType.GUEST || this.personService.personExists(authority) == true)
{
// found a User authority
NodeRef ref = this.personService.getPerson(authority);
String firstName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_FIRSTNAME);
String lastName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_LASTNAME);
label.append(firstName)
.append(" ")
.append(lastName != null ? lastName : "")
.append(" (")
.append(Application.getMessage(FacesContext.getCurrentInstance(), role))
.append(")");
label.append(buildLabelForUserAuthorityRole(authority, role));
}
}
else
{
// found a group authority
label.append(authority.substring(PermissionService.GROUP_PREFIX.length()))
.append(" (")
.append(Application.getMessage(FacesContext.getCurrentInstance(), role))
.append(")");
label.append(buildLabelForGroupAuthorityRole(authority, role));
}
this.userGroupRoles.add(new UserGroupRole(authority, role, label.toString()));
@@ -660,6 +648,44 @@ public abstract class InviteUsersWizard extends AbstractWizardBean
return this.mailHelper;
}
/**
* Helper to build a label of the form:
* Firstname Lastname (Role)
*/
public String buildLabelForUserAuthorityRole(String authority, String role)
{
// found a User authority
NodeRef ref = this.personService.getPerson(authority);
String firstName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_FIRSTNAME);
String lastName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_LASTNAME);
StringBuilder buf = new StringBuilder(100);
buf.append(firstName)
.append(" ")
.append(lastName != null ? lastName : "")
.append(" (")
.append(Application.getMessage(FacesContext.getCurrentInstance(), role))
.append(")");
return buf.toString();
}
/**
* Helper to build a label for a Group authority of the form:
* Groupname (role)
*/
public String buildLabelForGroupAuthorityRole(String authority, String role)
{
StringBuilder buf = new StringBuilder(100);
buf.append(authority.substring(PermissionService.GROUP_PREFIX.length()))
.append(" (")
.append(Application.getMessage(FacesContext.getCurrentInstance(), role))
.append(")");
return buf.toString();
}
/**
* Simple wrapper class to represent a user/group and a role combination
*/