Commit Graph

34 Commits

Author SHA1 Message Date
Jan Vonka
0405e3adbb Merged V3.0 to HEAD
12251: Fix for wiki parsing regression
  12253: More regression fixes in wiki parser
  12255: Update Share web session timeout value to 60 minutes.
  12289: Share wiki - ETHREEOH-1021, ETHREEOH-1022, ETHREEOH-880, ETHREEOH-1032
  12290: Additional to r12289
  12344: Fix for ETHREEOH-1066 - Wiki page editing no longer broken for page titles that don't exist yet.
  12355: ETHREEOH-984: External users in Share cannot edit profile
  12359: Fixed typo in Flash/HTML uploader type selection
  12364: ETHREEOH-1032 - Impossibility to delete Wiki page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-23 12:23:50 +00:00
Jan Vonka
3ab0ccf0df Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-19 12:15:59 +00:00
Kevin Roast
a4e58ed1df Merged V3.0 to HEAD
11982: Fix for ETHREEOH-906 - Writing the TICKET value directly to the page during template processing is a potential XSS security hole.
   11983: Added back .html suffix to plain HTML form upload api call - added code comment to explain why it's there.
   11984: Added debug/info level logging to Invite process.
   11985: ETHREEOH-184: thumbnail assocs do not double up on check-in and thumbnail updates are done in one action
   11986: Fix for ETHREEOH-905 - missing url encoding step for user password during webscript based login process.
   11995: Unit test fixed up, fallout from runAs merge.
   11998: Part of a fix for ETHREEOH-546 - Cannot save document to the any space for Microsoft Office
   11999: Merged V2.2 to V3.0
      11996: Fix for open Lucene ResultSet memory leaks
   12000: ETHREEOH-692 - It is impossible to login to Alfresco from Microsoft Office add-in using NTLM authentication. ETHREEOH-546 - Cannot save document to the any space for Microsoft Office.
   12001: Paging enabled by default in all Document Libraries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-18 15:08:14 +00:00
Kevin Roast
9cfb7526d7 Merged V3.0 to HEAD
11489: Added step for JDBC info
   11490: Fixed: ETHREEOH-452 Error appear when a user trying to view metadata for item, which is deleting
   11491: Blog integration package rename and removal of obsolete web-client beans
   11492: Adding missing web-extension dir to dynamic-website project
   11493: ETHREEOH_520: Fixes to prevent new users from being created when existing users invited to a site
   11494: Updated version to beta2
   11495: Fixes ETHREEOH-252, 392 & 393. When merged to 2.2 will also fix ETWOTWO-246 & 616 and when merged to HEAD will fix ALFCOM-1685 & 1712. 
   11496: Partial fix for ETHREEOH-27, fixes 2 out of the final 3 error conditions.
   11497: Fix for ETHREEOH-550

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12447 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-17 13:28:44 +00:00
Glen Johnson
a7076e1fde Various changes to Invite Service
- added functionality to forbid a user from cancelling a pending invite, if he/she is not a Site Manager for the site associated with that invite
- added CancelInviteAction workflow action class, with functionality to clean up disabled invitee account and invitee person node when (upon cancellation) there are no outstanding invites for that invitee.
- added various unit tests to InviteServiceTest for above functionality
- added automatic redeployment of invite process definition in setup(...) method of InviteServiceTest class
- other minor refinements to InviteServiceTest
- some minor refactoring to Invite Service to prevent code duplication amongst various invite web scripts and workflow action classes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10894 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-15 00:28:21 +00:00
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
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
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
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
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
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
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
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
Glen Johnson
57668a2647 Various improvements to InviteServiceTest in setup(), tearDown(), and startInvite() helper method
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-08-02 19:35:02 +00:00
Glen Johnson
6079c6fdfb Fix for inviteresponse web script - when an invitation is either accepted or rejected, the respective tasks in the invite workflow are now getting ended properly, thus ending the workflow
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-29 15:50:42 +00:00
Glen Johnson
90905a5ae1 Various minor fixes for REST Invite Service (mostly to starting the invitation process, building the invitation email and sending out the email)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-28 06:11:43 +00:00
Glen Johnson
9db77075db Added invitee first name and last name parameters to the "/api/invite/start" web script call for the Invite Service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-14 07:25:39 +00:00
Glen Johnson
a3412c899e Fixes to Invite Service to expose internal invite workflow instance ID externally as invite ID for all Invite Web Scripts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9822 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-11 17:10:46 +00:00
Glen Johnson
022f0bed8f Invite REST API Service with (1) additional Unit Tests (2) latest round of fixes so all unit tests for "invite", "inviteresponse" and "invites" (pending invites) Java-backed Web Scripts pass (3) moving superseded invite.get.js and inviteresponse.get.js out of the way and "turning on" Java-backed Web Scripts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-11 14:45:02 +00:00
Glen Johnson
f8d631f9f1 Latest fixes for Java-backed Invite REST API Web Scripts - but invites.get (pending invites) still failing on Unit Tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-10 10:10:03 +00:00
Glen Johnson
f0b7fc0569 Fix to GET invites web script API - invites now directly addressable by invite ID, see invites.get.desc.xml for API description
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-09 18:03:09 +00:00
Glen Johnson
595fd3f854 Latest round of Invites (pending invites) Java-backed Web Script fixes/modifications
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-09 15:37:07 +00:00
Glen Johnson
63bf4b1355 Latest drop of Java-backed version of Invite Web Scripts for (invite.get [start, cancel], inviteresponse.get [accept, reject], invites.get [pending])
- to take over from JavaScript version of these web scripts to allow secure running under admin authority

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-09 11:21:17 +00:00
Glen Johnson
e3afa83704 Latest cut of Invite Service/Workflow containing last bunch of fixes/modifications needed to get Web Script Unit Tests to pass
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-06-30 14:53:26 +00:00