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 to Invite REST API where inviteeUserName arg was not correctly checked when inviting external users.

Browse Source 
Also cleanup the related .js scripts to use spaces not tabs - significantly aids debugging in the script debugger.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-04-09 14:16:50 +00:00
parent 063f2df8b0
commit 043af1bbbd
5 changed files with 245 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js
View File

@@ -1,7 +1,6 @@
/** /**
* List/Search invitations implementation * List/Search invitations implementation
*/ */
function main() function main()
{ {
// Get the site id // Get the site id

6
config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.js
View File

@@ -1,5 +1,6 @@
// Cancel invitation for a web site /**
* Cancel invitation for a web site
*/
function main() function main()
{ {
// Get the url values // Get the url values
@@ -16,7 +17,6 @@ function main()
return; return;
} }
// Need to cancel an invitation here // Need to cancel an invitation here
var invitation = site.getInvitation(inviteId); var invitation = site.getInvitation(inviteId);
if (invitation == null) if (invitation == null)

2
config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.js
View File

@@ -3,7 +3,6 @@
*/ */
function main() function main()
{ {
// Get the site id // Get the site id
var urlElements = url.extension.split("/"); var urlElements = url.extension.split("/");
var shortName = urlElements[0]; var shortName = urlElements[0];
@@ -31,4 +30,3 @@ function main()
} }
main(); main();

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

@@ -3,7 +3,6 @@
*/ */
function main() function main()
{ {
var invitation = null; var invitation = null;
// Get the web site site // Get the web site site
@@ -78,8 +77,7 @@ function main()
if (invitationType == "NOMINATED") if (invitationType == "NOMINATED")
{ {
// Get mandatory properties
// Get Mandatory properties
if (!json.has("inviteeRoleName")) if (!json.has("inviteeRoleName"))
{ {
status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName has not been set."); status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName has not been set.");
@@ -95,17 +93,14 @@ function main()
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"))
{ {
var inviteeUserName = json.get("inviteeUserName"); invitation = site.inviteNominated(json.get("inviteeUserName"), inviteeRoleName, serverPath, acceptUrl, rejectUrl);
invitation = site.inviteNominated(inviteeUserName, inviteeRoleName, serverPath, acceptUrl, rejectUrl);
} }
else else
{ {
// Get Mandatory properties // Get mandatory properties
if (!json.has("inviteeFirstName")) if (!json.has("inviteeFirstName"))
{ {
status.setCode(status.STATUS_BAD_REQUEST, "The inviteeFirstName has not been set."); status.setCode(status.STATUS_BAD_REQUEST, "The inviteeFirstName has not been set.");

1
config/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.js
View File

@@ -1,7 +1,6 @@
/** /**
* List invitations implementation * List invitations implementation
*/ */
function main () function main ()
{ {
// Get the site id // Get the site id