inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2026-09-16 18:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added permission model bootstrap bean, added mediaWiki cusomt permission model, updated UI wizards to use custom permission models for derived types, added PHP mimetype

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2008-02-18 11:58:54 +00:00
parent e3227a03cd
commit 2a5f0a3cb8
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/java/org/alfresco/web/app/servlet/command/EditContentPropertiesCommand.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class EditContentPropertiesCommand extends BaseUIActionCommand
ServletContext sc = (ServletContext)properties.get(PROP_SERVLETCONTEXT);
ServletRequest req = (ServletRequest)properties.get(PROP_REQUEST);
ServletResponse res = (ServletResponse)properties.get(PROP_RESPONSE);
FacesContext fc = FacesHelper.getFacesContext(req, res, sc);
FacesContext fc = FacesHelper.getFacesContext(req, res, sc, "/jsp/return.jsp");
BrowseBean browseBean = (BrowseBean)FacesHelper.getManagedBean(fc, BrowseBean.BEAN_NAME);
// setup context from url args in properties map
source/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java
+1 -2
View File
@@ -26,7 +26,6 @@ package org.alfresco.web.bean.content;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.wizard.BaseInviteUsersWizard;
@@ -47,7 +46,7 @@ public class InviteContentUsersWizard extends BaseInviteUsersWizard
{
if (this.contentPermissions == null)
{
this.contentPermissions = getPermissionService().getSettablePermissions(ContentModel.TYPE_CONTENT);
this.contentPermissions = this.permissionService.getSettablePermissions(getNode().getType());
}
return this.contentPermissions;
source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
+1 -2
View File
@@ -26,7 +26,6 @@ package org.alfresco.web.bean.spaces;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.wizard.BaseInviteUsersWizard;
@@ -47,7 +46,7 @@ public class InviteSpaceUsersWizard extends BaseInviteUsersWizard
{
if (this.folderPermissions == null)
{
this.folderPermissions = getPermissionService().getSettablePermissions(ContentModel.TYPE_FOLDER);
this.folderPermissions = this.permissionService.getSettablePermissions(getNode().getType());
}
return this.folderPermissions;
source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
+5 -1
View File
@@ -93,7 +93,7 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
transient private AuthorityService authorityService;
/** PermissionService bean reference */
transient private PermissionService permissionService;
transient protected PermissionService permissionService;
/** personService bean reference */
transient private PersonService personService;
@@ -506,6 +506,10 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
for (String permission : perms)
{
String displayLabel = bundle.getString(permission);
if (displayLabel.startsWith("$$") == true)
{
displayLabel = permission;
}
roles[index++] = new SelectItem(permission, displayLabel);
}