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

Fix for SLNG-1155 - Pending Invite screen (Site Members area) fails on display with error during processing of the template 'get(assocs) failed on instance of org.alfresco.repo.jscript.ScriptNode'

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2008-09-08 11:45:26 +00:00
parent a451a5c8d2
commit 8daf020d4d
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/web/scripts/invite/InviteHelper.java
View File

@@ -29,9 +29,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.jscript.ScriptNode;
import org.alfresco.repo.site.SiteInfo; import org.alfresco.repo.site.SiteInfo;
import org.alfresco.repo.site.SiteService; import org.alfresco.repo.site.SiteService;
import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
@@ -156,18 +156,20 @@ public class InviteHelper
// fetch the person node for the inviter // fetch the person node for the inviter
NodeRef inviterRef = personService.getPerson(inviterUserNameProp); NodeRef inviterRef = personService.getPerson(inviterUserNameProp);
ScriptNode inviterPerson = null; TemplateNode inviterPerson = null;
if (inviterRef != null) if (inviterRef != null)
{ {
inviterPerson = new ScriptNode(inviterRef, serviceRegistry); inviterPerson = new TemplateNode(inviterRef, serviceRegistry, null);
//inviterPerson = new ScriptNode(inviterRef, serviceRegistry);
} }
// fetch the person node for the invitee // fetch the person node for the invitee
NodeRef inviteeRef = personService.getPerson(inviteeUserNameProp); NodeRef inviteeRef = personService.getPerson(inviteeUserNameProp);
ScriptNode inviteePerson = null; TemplateNode inviteePerson = null;
if (inviteeRef != null) if (inviteeRef != null)
{ {
inviteePerson = new ScriptNode(inviteeRef, serviceRegistry); inviteePerson = new TemplateNode(inviteeRef, serviceRegistry, null);
//inviteePerson = new ScriptNode(inviteeRef, serviceRegistry);
} }
// create and return a invite info // create and return a invite info

22
source/java/org/alfresco/repo/web/scripts/invite/InviteInfo.java
View File

@@ -24,9 +24,10 @@
*/ */
package org.alfresco.repo.web.scripts.invite; package org.alfresco.repo.web.scripts.invite;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import org.alfresco.repo.jscript.ScriptNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.repo.site.SiteInfo; import org.alfresco.repo.site.SiteInfo;
/** /**
@@ -35,8 +36,10 @@ import org.alfresco.repo.site.SiteInfo;
* *
* @author glen dot johnson at alfresco dot com * @author glen dot johnson at alfresco dot com
*/ */
public class InviteInfo public class InviteInfo implements Serializable
{ {
private static final long serialVersionUID = -4514253998906200208L;
// invitation statuses // invitation statuses
public static final String INVITATION_STATUS_PENDING = "pending"; public static final String INVITATION_STATUS_PENDING = "pending";
public static final String INVITATION_STATUS_ACCEPTED = "accepted"; public static final String INVITATION_STATUS_ACCEPTED = "accepted";
@@ -45,17 +48,17 @@ public class InviteInfo
// private instances to hold property values // private instances to hold property values
private String invitationStatus; private String invitationStatus;
private String inviterUserName; private String inviterUserName;
private ScriptNode inviterPerson; private TemplateNode inviterPerson;
private String inviteeUserName; private String inviteeUserName;
private ScriptNode inviteePerson; private TemplateNode inviteePerson;
private String role; private String role;
private String siteShortName; private String siteShortName;
private SiteInfo siteInfo; private SiteInfo siteInfo;
private Date sentInviteDate; private Date sentInviteDate;
private String inviteId; private String inviteId;
public InviteInfo(String invitationStatus, String inviterUserName, ScriptNode inviterPerson, public InviteInfo(String invitationStatus, String inviterUserName, TemplateNode inviterPerson,
String inviteeUserName, ScriptNode inviteePerson, String role, String inviteeUserName, TemplateNode inviteePerson, String role,
String siteShortName, SiteInfo siteInfo, Date sentInviteDate, String inviteId) String siteShortName, SiteInfo siteInfo, Date sentInviteDate, String inviteId)
{ {
this.invitationStatus = invitationStatus; this.invitationStatus = invitationStatus;
@@ -115,7 +118,7 @@ public class InviteInfo
* *
* @return the invitee person * @return the invitee person
*/ */
public ScriptNode getInviteePerson() public TemplateNode getInviteePerson()
{ {
return inviteePerson; return inviteePerson;
} }
@@ -125,7 +128,7 @@ public class InviteInfo
* *
* @return the inviter person * @return the inviter person
*/ */
public ScriptNode getInviterPerson() public TemplateNode getInviterPerson()
{ {
return inviterPerson; return inviterPerson;
} }
@@ -160,7 +163,8 @@ public class InviteInfo
return role; return role;
} }
public SiteInfo getSiteInfo() { public SiteInfo getSiteInfo()
{
return siteInfo; return siteInfo;
} }