inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIXED : ALF-12036: External User Invitation issues

Browse Source 
Uses the serverPath from sysAdminParams instead of being passed in by webscripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2011-12-20 15:41:39 +00:00
parent e564eda697
commit 61b23f8e84
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js
View File

@@ -89,14 +89,13 @@ function main()
status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName is null or empty."); status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName is null or empty.");
return; return;
} }
var serverPath = json.get("serverPath");
var acceptUrl = json.get("acceptURL"); var acceptUrl = json.get("acceptURL");
var rejectUrl = json.get("rejectURL"); var rejectUrl = json.get("rejectURL");
// Get the optional properties // Get the optional properties
if (json.has("inviteeUserName") && json.get("inviteeUserName") != "") if (json.has("inviteeUserName") && json.get("inviteeUserName") != "")
{ {
invitation = site.inviteNominated(json.get("inviteeUserName"), inviteeRoleName, serverPath, acceptUrl, rejectUrl); invitation = site.inviteNominated(json.get("inviteeUserName"), inviteeRoleName, acceptUrl, rejectUrl);
} }
else else
{ {
@@ -120,7 +119,7 @@ function main()
var inviteeFirstName = json.get("inviteeFirstName") ; var inviteeFirstName = json.get("inviteeFirstName") ;
var inviteeLastName = json.get("inviteeLastName") ; var inviteeLastName = json.get("inviteeLastName") ;
var inviteeEmail = json.get("inviteeEmail") ; var inviteeEmail = json.get("inviteeEmail") ;
invitation = site.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeRoleName, serverPath, acceptUrl, rejectUrl); invitation = site.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeRoleName, acceptUrl, rejectUrl);
} }
} }

1
config/alfresco/web-scripts-application-context.xml
View File

@@ -669,7 +669,6 @@
class="org.alfresco.repo.web.scripts.invite.Invite" class="org.alfresco.repo.web.scripts.invite.Invite"
parent="webscript"> parent="webscript">
<property name="invitationService" ref="InvitationService"/> <property name="invitationService" ref="InvitationService"/>
<property name="sysAdminParams" ref="sysAdminParams"/>
</bean> </bean>
<!-- --> <!-- -->

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

@@ -70,21 +70,12 @@ public class Invite extends DeclarativeWebScript
// services // services
private InvitationService invitationService; private InvitationService invitationService;
private SysAdminParams sysAdminParams;
public void setInvitationService(InvitationService invitationService) public void setInvitationService(InvitationService invitationService)
{ {
this.invitationService = invitationService; this.invitationService = invitationService;
} }
/**
* @param sysAdminParams the sysAdminParams to set
*/
public void setSysAdminParams(SysAdminParams sysAdminParams)
{
this.sysAdminParams = sysAdminParams;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
@@ -221,12 +212,11 @@ public class Invite extends DeclarativeWebScript
{ {
if (inviteeUserName != null) if (inviteeUserName != null)
{ {
newInvite = invitationService.inviteNominated(inviteeUserName, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl); newInvite = invitationService.inviteNominated(inviteeUserName, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, acceptUrl, rejectUrl);
} }
else else
{ {
serverPath = UrlUtil.getShareUrl(sysAdminParams); newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, acceptUrl, rejectUrl);
newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl);
} }
// add model properties for template to render // add model properties for template to render
model.put(MODEL_PROP_KEY_ACTION, ACTION_START); model.put(MODEL_PROP_KEY_ACTION, ACTION_START);