From 4c522387c3569d9528f1181f9cff95949969a271 Mon Sep 17 00:00:00 2001
From: Michael Ru <michael@ruflin.ch>
Date: Thu, 21 Aug 2008 11:59:47 +0000
Subject: [PATCH] - added pending-invites, accept-invite and reject-invite
 pages. - adapted header component to only show logo and help if no user
 logged in

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repository/invite/invite.get.json.ftl | 14 +-------------
 .../alfresco/workflow/invite_processdefinition.xml |  8 ++++----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
index c5d2df1b5f..3055f92b61 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
@@ -1,33 +1,21 @@
 {
    "action" : "${action}",
    <#if inviteId??>
-      "inviteId" : "${inviteId}",
-   <#else>
-      "inviteId" : undefined,
+   "inviteId" : "${inviteId}",
    </#if>
    <#if inviteeUserName??>
       "inviteeUserName" : "${inviteeUserName}",
-   <#else>
-      "inviteeUserName" : undefined,
    </#if>
    <#if inviteeFirstName??>
       "inviteeFirstName" : "${inviteeFirstName}",
-   <#else>
-      "inviteeFirstName" : undefined,
    </#if>
    <#if inviteeLastName??>
       "inviteeLastName" : "${inviteeLastName}",
-   <#else>
-      "inviteeLastName" : undefined,
    </#if>
    <#if inviteeEmail??>
       "inviteeEmail" : "${inviteeEmail}",
-   <#else>
-      "inviteeEmail" : undefined,
    </#if>
    <#if siteShortName??>
       "siteShortName" : "${siteShortName}"
-   <#else>
-      "siteShortName" : undefined
    </#if>
 }
\ No newline at end of file
diff --git a/config/alfresco/workflow/invite_processdefinition.xml b/config/alfresco/workflow/invite_processdefinition.xml
index 62696f370b..a00879c720 100644
--- a/config/alfresco/workflow/invite_processdefinition.xml
+++ b/config/alfresco/workflow/invite_processdefinition.xml
@@ -40,20 +40,20 @@
                   + "'" + wf_siteShortName + "', "
                   + "please follow this link:\n"
                   + wf_serverPath + wf_acceptUrl
-                  + "&amp;inviteId=" + workflowId
+                  + "?inviteId=" + workflowId
                   + "&amp;inviteeUserName=" + wf_inviteeUserName
                   + "&amp;siteShortName=" + wf_siteShortName
-                  + "&amp;ticket=" + wf_inviteTicket
+                  + "&amp;inviteTicket=" + wf_inviteTicket
                   + "\n\n"
                   + mail_text_invitee_account_section
                   + "To reject the invitation to join the site "
                   + "'" + wf_siteShortName + "', "
                   + "please follow this link:\n"
                   + wf_serverPath + wf_rejectUrl
-                  + "&amp;inviteId=" + workflowId
+                  + "?inviteId=" + workflowId
                   + "&amp;inviteeUserName=" + wf_inviteeUserName
                   + "&amp;siteShortName=" + wf_siteShortName
-                  + "&amp;ticket=" + wf_inviteTicket;                  
+                  + "&amp;inviteTicket=" + wf_inviteTicket;                  
                mail.execute(bpm_package);
             </script>
          </action>