diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js index b2c674ee90..cced016e96 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js @@ -89,14 +89,13 @@ function main() status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName is null or empty."); return; } - var serverPath = json.get("serverPath"); var acceptUrl = json.get("acceptURL"); var rejectUrl = json.get("rejectURL"); // Get the optional properties 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 { @@ -120,7 +119,7 @@ function main() var inviteeFirstName = json.get("inviteeFirstName") ; var inviteeLastName = json.get("inviteeLastName") ; var inviteeEmail = json.get("inviteeEmail") ; - invitation = site.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeRoleName, serverPath, acceptUrl, rejectUrl); + invitation = site.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeRoleName, acceptUrl, rejectUrl); } } diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 6faabc18f2..6ed7711953 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -669,7 +669,6 @@ class="org.alfresco.repo.web.scripts.invite.Invite" parent="webscript"> - diff --git a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java index a96054ed17..329e939fcc 100644 --- a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java +++ b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java @@ -70,21 +70,12 @@ public class Invite extends DeclarativeWebScript // services private InvitationService invitationService; - private SysAdminParams sysAdminParams; public void setInvitationService(InvitationService invitationService) { this.invitationService = invitationService; } - /** - * @param sysAdminParams the sysAdminParams to set - */ - public void setSysAdminParams(SysAdminParams sysAdminParams) - { - this.sysAdminParams = sysAdminParams; - } - /* * (non-Javadoc) @@ -221,12 +212,11 @@ public class Invite extends DeclarativeWebScript { 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 { - serverPath = UrlUtil.getShareUrl(sysAdminParams); - newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, serverPath, acceptUrl, rejectUrl); + newInvite = invitationService.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, Invitation.ResourceType.WEB_SITE, siteShortName, inviteeSiteRole, acceptUrl, rejectUrl); } // add model properties for template to render model.put(MODEL_PROP_KEY_ACTION, ACTION_START);