Commit Graph

199 Commits

Author SHA1 Message Date
Mike Hatfield
8daf020d4d 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'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-08 11:45:26 +00:00
Mike Hatfield
a451a5c8d2 Fix test clean-up
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-08 00:32:34 +00:00
Glen Johnson
07f84b3914 Added code so that 'start invite' throws Web Script Exception (http Status 'forbidden') when inviter tries to invite someone to a site that he/she is not the Site Manager of (and added supporting code to Invite Service Unit Tests)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 16:48:42 +00:00
David Caruana
01a5a7edf4 Merge from DEV/SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 13:11:31 +00:00
David Caruana
5c11d55248 Merge from DEV/SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10836 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 13:10:24 +00:00
David Caruana
228497e076 Merge from DEV/SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 13:07:17 +00:00
David Caruana
a42cc8992f Merge from DEV/SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10832 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 13:06:28 +00:00
David Caruana
64bf87af37 Merge from DEV/SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-07 13:04:45 +00:00
Glen Johnson
946789aa4c Made change from running "set invitee's site membership" as "admin" to running as inviter user retrieved off workflow process variables. (have to explicitly do a "runas user" because current user somehow becomes 'null' in workflow execution thread)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-05 22:42:22 +00:00
Derek Hulley
5bfd353058 Fixed NPE in RepositoryContainer: TenantService usage now removed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-05 16:15:49 +00:00
Derek Hulley
3517f56b71 Fixed for MT Node Interceptor
- When MT is enabled, there is still a problem with the translation of NodeRefs for the UserUsage component


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-05 15:58:48 +00:00
Derek Hulley
6bb620a57b Multi-Tenant node interceptor
- Actually less happening here than it would first appear
 - Some MT bean and interface consolidation
 - The unit test has no meat to it, yet... coming soon!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-05 13:04:46 +00:00
Glen Johnson
4bfa120a9c Changed validation check within 'start invite' operation (which checks that the task retrieved off the newly started workflow is the 'inviteToSite' task) to no longer look at the task title (which now picks up the title from the invite workflow message properties)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-05 12:06:14 +00:00
Glen Johnson
12a855d511 1. Added code and config to assign invitee person as assignee on invite workflow
2. Various changes to invite service arising from moving accept and reject logic and operations out of invite web scripts, and into workflow actions on respective "accept" and "reject" transitions of invitePending task
- in web-scripts-application-context removed services no longer needed for invitereponse web script (only needs WorkflowService)
- moved logic and operations for accept and reject invite out of inviteresponse web script and into AcceptInviteAction and RejectInviteAction actions for invitePending task in workflow definition
- refine house keeping work that cleans up invitee person node and disabled account if they are no longer being used (no outstanding pending invites for invitee) when invitee rejects invite
- changed pending invites query to cater for when inviteAccepted and inviteRejected tasks left incomplete in inviter's dashboard "tasklist"
- a few minor code cleanups
- added SiteService to ServiceRegistry for use in accept and reject workflow action classes
 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 15:44:56 +00:00
David Caruana
f2512db0f3 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:30:47 +00:00
David Caruana
22bc716fcc Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:29:25 +00:00
David Caruana
865ea6668f Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:28:40 +00:00
David Caruana
6ea64c2e0f Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:27:19 +00:00
David Caruana
40bb33b90e Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:25:34 +00:00
David Caruana
385ea356c4 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:24:01 +00:00
David Caruana
d2619d5ea9 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:22:17 +00:00
David Caruana
57c7de2df6 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:15:27 +00:00
David Caruana
fb231f88bc Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:09:45 +00:00
David Caruana
3e303a86d5 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:08:13 +00:00
David Caruana
a6e263078e Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 11:06:42 +00:00
David Caruana
bf504cba8c Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:59:40 +00:00
David Caruana
7e0b3f5453 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:58:29 +00:00
David Caruana
86fa1c011f Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:56:47 +00:00
David Caruana
e22df58ebb Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:55:16 +00:00
David Caruana
703d1a3564 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:53:14 +00:00
David Caruana
d4bb800e1d Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:46:38 +00:00
David Caruana
f51be032bc Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:44:42 +00:00
David Caruana
617f8e0b2c Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:43:08 +00:00
David Caruana
f5f2eb4b02 Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:42:23 +00:00
David Caruana
9bb82eff7f Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:41:04 +00:00
David Caruana
a0a36dd1ed Merge from SEAMIST3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-04 10:40:14 +00:00
Logneon
42fbf1dd08 ALFCOM-1859
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-02 08:27:16 +00:00
Derek Hulley
c3f7e42616 Merged V2.9 to HEAD
9409: Fix ETWONINE-12
   9459: Fix for ETWONINE-17 (error message appears instead of notification message when mananging deleted items
   9468: User usages - add test, ensure multiple beforeDeletes are only handled once
   9473: User usages - add tests + fixes (ETWONINE-43, ETWONINE-44, recalc missing usages)
   9491: Remove noop://noop empty store (added during merge)
   9662: User usages - minor fix (if "owner" qname not present)
   9843: Merged V2.2 to V2.9
      9486: Merged HEAD to V2.2
         9482: New commands for AVM Console (AVMInterpreter). Version parameter is not longer mandatory for simple commands.
      9727: Merged V2.1 to V2.2
         9211: Workaround for extraneous ".ppt" extension when saving PowerPoint files over WebDAV


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-30 03:04:01 +00:00
Michael Ru
0cbea60cf6 - changed accept/reject webscripts to put method
- some code cleanup / removed obsolete invite.get.html.ftl

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-26 09:53:05 +00:00
Michael Ru
03a08a20f9 - added webscript to get invite information for a given id and ticket
- invite response webscript now uses correct api and put/delete method and only requires invite id and ticket
- improved invite accept/reject pages ui, correct handling in case the invite has already been canceled
- fixed buggy digit-only usernames handling in memberships webscript
- slightly changed comment activities wording

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-22 19:58:31 +00:00
Glen Johnson
d0d19ba6ea Various Invite Service fixes
- removed unnecessary siteService property from 'invites' web script
- removed unnecessary getSentDateFromInvite(...)) method from InviteHelper.java
- added comments to property getters in InviteInfo.java
- return sentInviteDate, inviteeSiteRole and invitationStatus from 'invites' Web Script   

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-22 12:39:24 +00:00
Glen Johnson
e0921fe3ef Committing Invite.java left out of last commit (for revision r10481) by mistake
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-22 08:48:45 +00:00
Glen Johnson
f32aa602f5 Fix for bug with Invite Service's "inviteresponse" web script where 'accepting' or 'rejecting' a site invitation was completing the associated workflow task for workflow instances other than just the instance it was related to
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-21 17:24:57 +00:00
Kevin Roast
0103b7ca03 Slingshot Change Password page and implementation.
Repository API for change password.
Fixes to webscript framework to ensure that webscript POSTed Content is only read once from the underlying inputstream - it was previously possible for a Java backed WebScript to read content during executeImpl() and the same inputstream content would be further processed again when the template parameters for the output were generated.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-21 10:55:11 +00:00
Michael Ru
2fd6dd1f39 - added serverPath, acceptUrl, rejectUrl and ticket params to the invite webscript/workflow
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10439 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-20 11:58:11 +00:00
Roy Wetherall
b5caf3fdef Thumbnail Service: can now get a list of thumbnail definitions that can be applied to a given content property
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-20 10:27:56 +00:00
Glen Johnson
f4da392bc3 Change to Invite Service so that 'start invite' operation receives a given invitee site role and 'accept invite' picks it off the workflow and sets the invitee's site membership with that role
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-20 09:06:13 +00:00
Michael Ru
496d70736b adapted "invites" webscript to return all data required for the sent-invites page. Some data only stubbed currently
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-19 17:23:51 +00:00
Glen Johnson
1533fdf240 Removed invite service test which checks that the 'start invite' operation rejects starting an invitation when a duplicate one is already pending (until I find a fix for misbehaving workflow query behind it)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-19 11:58:17 +00:00
Glen Johnson
da322f33ca Various fixes to "start" operation in Invite Web Script
- Fixed bug where "start invite" web script operation was always generating a new disabled invitee account, even if an account for a user with the given invitee email address already existed.
- Make sure that invitee ONLY receives account details in invitation email if a disabled invitee account has just been created for invitee prior to sending out the email (i.e. if there was no pre-existing account for the invitee and thus a disabled invitee account had to be created)
- Breaking out the long "start invite" web script method into various helper methods
- Throw web script exception if "start invite" web script operation hasn't been able to generate a unique user name for the given invitee email address after 10 attempts.
- If "start invite" web script operation detects that a person already exists in the repository with the given invitee email address, then use that existing person as the invitee (instead of always creating a new person node for the given invitee email address)  
- Throw Web Script exception if "start invite" web script operation detects that given invitee is already a member of the given site
- Added more comments to the code

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-18 16:38:38 +00:00