mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged V4.1-BUG-FIX to HEAD
41035: Fix for ALF-15225 - qt.length not performing as expected in search.lib.js
41047: RUSSIAN: Translation updates based on EN r40961
41049: GERMAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41050: SPANISH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41051: FRENCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41052: ITALIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41053: JAPANESE: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41054: DUTCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41055: RUSSIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
41061: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
41063: RUSSIAN: Translation updates based on EN r41033 (encoding fixes)
41064: CHINESE: Translation updates based on EN r41033
41073: ALF-15760: Merged V4.0 to V4.1-BUG-FIX (another lost meta-inf revision)
34416: ALF-12992: Updated weblogic DD for SOLR
41074: ALF-15419 / ALF-14438: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (PARTIAL)
37373: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
36821: ALF-13827 / ALF-14402: Make replicated caches recover from temporary comms failures by flushing when a change in peers is detected
- We do not flush caches who replicate via copy (e.g. tickets cache) as these may not be recoverable
37122: ALF-13919 / ALF-14403: Merged DEV to PATCHES/V3.4.6
- Rework of Dmitry's implementation
- Uses dynamic HQL query to retrieve JBPM workflow instances by specified query criteria
- WorkflowInstancesGet web script no longer has to iterate over every workflow instance in the database!
- DB index added to enable efficient querying by string variable
- Hibernate tastic!
37188: ALF-13919 / ALF-14403: Worked around HQL polymorphism issues by using explicit variable subclass names in from clause
37204: ALF-13919 / ALF-14403: Fix to date range handling by Dmitry
41077: ALF-10730: Fixed object finder drop-down tree to show parent icon type when icon type not available
41089: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
41109: Part fix for ALF-11297 Disabled test: test-system-build-test has been removed from the test target dependency list
41118: Fixes: ALF-15765 and related issue ALF-15476:
- Corrects merge of r34405 and r40159
- Adds people api to cloud proxy config
- Cloud/Global Folder picker sites list now universally shows only those sites the user is a member of.
41119: ALF-15419 / ALF-14438: Merged DEV to V4.1-BUG-FIX
41117: ALF-15419 : CLONE Remove JBPM indexes present from upgrades
The schema reference files were updated to contain JBPM_VARIABLEINSTANCE.IDX_VARINST_STRVAL index.
41130: ALF-15590: FSTR transfer of custom content type with parent cm:content fails
- Fix by Dmitry
41131: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
- Fix provided by Bitrock
41132: Fix for ALF-14388 - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files
- corrected mimetypes to be lower-case
41150: ALF-13287 Added the handling of UTC represented by "Z" within comparator
41154: Check for authentication errors when validating a ticket, if an error occurs re-authenticate. ALF-15394
41155: ALF-15569: User with '@' symbol in username cannot invite
- note: since Ent 4.0.2(+) by default MT is pre-configured but not enabled
41173: Merged V4.1 to V4.1-BUG-FIX
41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
41176: Attempt to debug unit test failure
41181: Store leak in AVMServiceTest.test_ETWOTWO_570() causing unit test failure
41184: ALF-15610: Copy Thai analyzer settings to its many SOLR locations
41194: ALF-11297: re-enable system build tests
41195: ALF-11297 ALF-15807: update activities system build tests after correction of ALF-4832
41201: Fix for ALF-15767 Group query using cm:authorityName
41202: Additional unit tests related to ALF-15731 TYPE:"..." queries no longer work for Lucene on 4.X
41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
- check it makes any difference
41204: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX: (note: merging as-is ... refactor + unit test fix to follow in next commit)
40926: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
40974: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
41205: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
- review and refactor the proposed/merged fix (see previous commit)
- fix unit test so that it accounts for previous content (as per the original issue)
- also: add missing test to suite and fix that test to work with the new fix (ie. cleanup previous content, else need to account for it)
41210: Part 2: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
- do not expand authorities for thoses with the ADMINISTRATOR_ROLE as they can read all anyway
41216: ALF-11297: system build tests need a database cleanup before running
41222: ALF-15740, ALF-14744: Update rule firing broken for content created in Explorer
- Old code lurking around that used to use the inline editable aspect to detect events handled by the CreateNodeRuleTrigger was removed from OnContentUpdateRuleTrigger and replaced with a check for ASPECT_NO_CONTENT
41223: Added missing swf.languagedir setting to enterprise alfresco-global.properties
41230: GERMAN: Translation updates based on EN rev41099.
41232: SPANISH: Translation updates based on EN rev41099.
41233: FRENCH: Translation updates based on EN rev41099.
41234: ITALIAN: Translation updates based on EN rev41099.
41235: JAPANESE: Translation updates based on EN rev41099.
41236: DUTCH: Translation updates based on EN rev41099.
41237: RUSSIAN: Translation updates based on EN rev41099.
41239: CHINESE: Translation updates based on EN rev41099.
41254: ALF-15628: Avoid edit online (SPP, WRITE_LOCK) clashing with edit offline (CheckOutCheckInService, READ_ONLY_LOCK)
- Rationalization of work by Alex Malinovsky
- WebDAVMethod.checkNode() now properly checks whether nodes without WebDAV lock info are writeable
- CheckOutCheckInService won't allow checkout of a node with an existing WRITE_LOCK by the same user - they must unlock first
- Propagation of correct status codes
41264: ALF-15628: Fix CheckOutCheckInService test failures
41265: ALF-15699: Reverse merged the following, thus downgrading us back to swftools 0.9.1
40208: ALF-12831: Upgrade to swftools 0.9.2
41266: Rush'n in some translation updates from Gloria
41267: ALF-15628: Fix compilation problem
41269: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
41224: ALF-14856: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
41268: ALF-15459: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
Merged V4.1-BUG-FIX to V3.4-BUG-FIX
41274: ALF-15608: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
41272: ALF-15567: Allow links to be followed through WebDAV on port 80 using basic auth on XP
41277: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
- fix test fallout after merge/fix (note: failed for PostgreSQL but not MySQL - although fix was not DB-specific)
41278: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal
41284: ALF-14875: Serialize direct permissions after inherited permissions so that they take precedence in any lookups in permission dialogs
41290: JAPANESE: Translation updates based on EN r41099 Fixes: ALF-14565
41296: ALF-15251 CIFS: Checked out document is not marked as locked in CIFS
41299: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
- Additional fix provided by Bitrock
41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
- do not skip IO Exceptions
41306: Incremented version revision for 4.1.2
41309: ALF-15827: Added FORMACTION, FORMMETHOD and ACTION HTML attributes to grey list to close security hole (updated Surf libs r1136)
41318: ALF-15857: Lucene FTS indexer opens streams to all documents to be indexed in a transaction simultaneously
- Now stream opening is delayed until the point where the document is being written to the index
41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
41326: ALF-15234: IE 8 or IE9 Download .pps as .ppt
-Switched the order of the filename headers to better support non-conforming browsers (rfc 5987).
41330: ALF-14875: Reversed r41284 because it didn't solve the problem in the UI. Kev reviewing.
41332: ALF-10688: Can't deactivate an account when alfrescoNtlm follows another authentication subsystem in the authentication chain
- Now, if a account is known to be 'mutable' then the enabled flag is read from the mutable authentication service
41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2)
41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
41339: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal
- Found some more cases where this is logged as an ERROR
41342: ALF-11087 (Missing icon file: components\images\filetypes\generic-tag-32.png)
41344: ALF-15863 (* search values): Merged HEAD to V4.1-BUG-FIX (4.1.2)
40849: ALF-12839 "Share - Inconsistency in adding a user or a group into a group" part 2
- Making the users console stop "*" searches, just like the groups console when the min search length is set to larger than 0.
41346: ALF-15237 - REST API Group children lists username for fullName and displayName
41350: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
41065: Disconnect existing CIFS sessions from the same client when a virtual circuit zero session is opened. ALF-13815
41280: Moved session cleanup config into the base authenticator, added support to passthru/base authentication. ALF-13815
41351: Ported database filesystem changes to fix session disconnect, from V3.4.
41352: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
41067: Added session disconnect support to the Alfresco CIFS authenticator. ALF-13815.
41281: Added session cleanup support to passthru authenticator, session cleanup config moved to base class. ALF-13815
41353: Update svn:mergeinfo
41355: Fix for ALF-15869 - "Site Content" dashlet shows all documents from all the sites in Alfresco Share
- mistakenly did a record-only merge of this from 4.1->4.1.1
41363: Fix for ALF-14875 - Manage permissions shows the permission 'No privileges' for All Other Users
- reworked the permissions dialog and permissions panels to correctly handle multiple permissions on a special permissions group such as GROUP_EVERYONE
- now correctly gets/sets permissions for GROUP_EVERYONE
- this also fixes ALF-12014 - in that it allows custom SiteXYZ permissions to work correctly again also (will need manual backport for 3.4.X though)
- removed hacks related to previous attempts to fix the above issue
- added lots of comments around relevant sections to add in future refactoring or understanding
41371: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
41370: Fix for ALF-12014 - Share - Custom role causes incorrect display of permissions
Manual merge of changes to 4.1.2
41399: ALF-13438: java.lang.OutOfMemoryError appears in alfresco log when trying to create few thousands of sites consistently.
- The v4.0 parent assocs cache used to store every verion of every node's parent assocs, so as we added a node to 60,000 sites, we retained all previous versions of the user's parent association map
- After creating 10,000 sites, the cache size was about 4GB, containing about 2 million parents
- Now we use a specialized class that allows an upper limit to be set on the total number of cached parents as well as children.
- Because the cache is keyed by node transaction ID, the cache can be non-clustered and non-transactional
- Once the average number of parents is more than 8, the cache will drop its oldest entries
- ParentAssocsInfo also now uses a compact TreeMap instead of a HashMap
41401: ALF-13438: Small correction
41406: ALF-13438: Fix failing unit tests
- Removed unused node.parentAssocsSharedCache and corrected node.childByNameCache not to reference it!
- Because parent assocs are cached by transaction ID, we must always invalidate them on an in-transaction version increment
41409: Logging of unexepected errors on FTP
41411: Fix possible FTP data session leak if client mixes PORT and PASV commands. ALF-15126
41412: ALF-15845 : Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
41415: Fixes: ALF-15649: Removes country locale from files with it hard coded.
41419: ALF-14599: Removed ftp.ipv6.enabled from enterprise overlay and bundles
41426: ALF-15845 Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
Roll back changes to DiskDriver interface in favour of hacking NetworkFile.
41440: JAPANESE: Translation update based on EN r41099
41446: ALF-13091: Remove unecessary bean post processors from sub ssytem context and remove CXF's Jsr250BeanPostProcessor.
41458: RUSSIAN: Further translation updates following linguistic review.
41459: ALF-15897: Revert revision 41446, an attempted fix for ALF-13091
41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
Fix for ALF-15851
Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
41506: Merged DEV to V4.1-BUG-FIX
41505: ALF-15879: PostgreSQL: upgrade 2.2.8 (577) -> 3.4.10 (703) -> 4.1.1 (159) failed.
- Make dropping "store_id" index and "alf_node_store_id_key" constraint optional in 4.1.1 upgrade script
because clean 3.4 has "store_id" index and doesn't have "alf_node_store_id_key" constraint,
but 3.4 upgraded from 2.2 has "alf_node_store_id_key" constraint and doesn't have "store_id" index.
41531: Fixed ALF-15687, so that any user (except for Admin) won’t be able to retrieve any other user’s preferences via REST API. Also, updated the preferences controllers for the Post and Delete.
41539: ALF-15899: Inbound email does not support multiple recipient folders
- Fix by Dmitry Vaserin
41540: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
40794: Merged DEV to V3.4-BUG-FIX
40793: ALF-13752 Saving Word (mac 2011) documents via CIFS into a folder with Versionable rules on Mac OS X Lion (Fix for 3.4)
In ContentDiskDriver.renameFile() was added a check whether a node in the archive.
40806: Fix for ALF-9787 - Hiding sites in Share with permissionsDefinitions.xml [creates a permissions error in the blog portion of the site]
40922: Merged DEV to V3.4-BUG-FIX (reviewed by Frederik)
40488: ALF-13357 : Empty outcome when a timer is invoked
A check for transitionName was added to AlfrescoTimer to support custom transitions.
40940: ALF-15696: Remove svnkit.jar - makes the build fail if the version of installed command line svn is 1.7. Using commandline binding for <svn> Ant task to be consistent with other parts of the build.
41066: Various fixes to the database filesystem for session disconnect cleanup.
41068: Updates to the Alfresco filesystem for session cleanup. ALF-13815
41301: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
40966: ALF-15846 / ALF-15709: OOM on cascading reindex
- Avoid buffering of all the affected PATH documents in memory - used the set of 'visited' paths to delay generation to the final flush.
41044: ALF-15847 / ALF-15748: Lucene indexer can make sub-optimal cascade reindex decisions during an LDAP sync.
- When a user in 6 groups was removed from a massive group, the massive group was getting cascade reindexed rather than the user
- Logic adjusted as follows:
For nodes with 5 or less parents, we always cascade reindex the child node. For nodes with more than 5 parents, we cascade reindex the parent node if it has less children than the child has parents.
41395: ALF-15715: Unable to edit properties whilst transformation in progress
- Delayed all changes that would potentially lock the parent node row while the thumbnail is generating.
- Reorganized RenditionContext to lazily instantiate its destination node.
- Changed render destination to use temporary ContentWriter until render is complete.
41396: ALF-15715: Fix for failing unit tests.
41413: Fix for issue where user calendar remote api was generating invalid date searches for user dashlet calendar.
41509: Merged DEV to V3.4-BUG-FIX
41507: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access
Context-param which Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false
41510: ALF-15171: After addition of a secondary parent association to a container, not all index paths were being regenerated due to a logic error
41512: ALF-15919: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
41091: ALF-15723: Merged DEV to PATCHES/V3.4.10
26579: Switch the transformer to use Tika
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -113,7 +113,7 @@ function getBlogPostData(node)
|
||||
*/
|
||||
function hasExternalBlogConfiguration(node)
|
||||
{
|
||||
if (node === null)
|
||||
if (node === null || !node.hasPermission("ReadProperties"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
blog-post.msg.deleted=\u0411\u043b\u043e\u0433 {0} \u0443\u0434\u0430\u043b\u0435\u043d
|
||||
blog-post.msg.deleted=\u0411\u043B\u043E\u0433 {0} \u0443\u0434\u0430\u043B\u0435\u043D
|
||||
@@ -1,2 +1,2 @@
|
||||
forum-post.msg.deleted=\u0423\u0437\u0435\u043b {0} \u0443\u0434\u0430\u043b\u0435\u043d
|
||||
forum-post.msg.marked.removed=\u0423\u0437\u0435\u043b {0} \u043e\u0442\u043c\u0435\u0447\u0435\u043d \u043a\u0430\u043a \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0439
|
||||
forum-post.msg.deleted=\u0423\u0437\u0435\u043B {0} \u0443\u0434\u0430\u043B\u0435\u043D
|
||||
forum-post.msg.marked.removed=\u0423\u0437\u0435\u043B {0} \u043E\u0442\u043C\u0435\u0447\u0435\u043D \u043A\u0430\u043A \u0443\u0434\u0430\u043B\u0435\u043D\u043D\u044B\u0439
|
||||
@@ -1,3 +1,3 @@
|
||||
links-delete.err.not.found=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0438\u043c\u0435\u043d\u0430 \u0441\u0441\u044b\u043b\u043e\u043a
|
||||
links-delete.access.denied=\u041d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c '{0}'
|
||||
links-delete.msg.deleted=\u0423\u0437\u0435\u043b {0} \u0443\u0434\u0430\u043b\u0435\u043d
|
||||
links-delete.err.not.found=\u041D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0438\u043C\u0435\u043D\u0430 \u0441\u0441\u044B\u043B\u043E\u043A
|
||||
links-delete.access.denied=\u041D\u0435\u0442 \u043F\u0440\u0430\u0432 \u043D\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438 \u0441 \u0438\u043C\u0435\u043D\u0435\u043C '{0}'
|
||||
links-delete.msg.deleted=\u0423\u0437\u0435\u043B {0} \u0443\u0434\u0430\u043B\u0435\u043D
|
||||
@@ -1,2 +1,2 @@
|
||||
links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438
|
||||
links.err.not.found=\u0421\u0441\u044b\u043b\u043a\u0430 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
|
||||
links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043D\u0435\u0442 \u043F\u0440\u0430\u0432 \u043D\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438
|
||||
links.err.not.found=\u0421\u0441\u044B\u043B\u043A\u0430 \u0441 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u043C \u0438\u043C\u0435\u043D\u0435\u043C \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430
|
||||
@@ -1,2 +1,2 @@
|
||||
links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438
|
||||
links.err.not.found=\u0421\u0441\u044b\u043b\u043a\u0430 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
|
||||
links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043D\u0435\u0442 \u043F\u0440\u0430\u0432 \u043D\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0438
|
||||
links.err.not.found=\u0421\u0441\u044B\u043B\u043A\u0430 \u0441 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u043C \u0438\u043C\u0435\u043D\u0435\u043C \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430
|
||||
@@ -1,11 +1,11 @@
|
||||
# User CSV Upload Web Script I18N
|
||||
person.err.userCSV.invalidForm=\u0414\u0430\u043d\u043d\u0430\u044f \u0444\u043e\u0440\u043c\u0430 \u043d\u0435 \u0431\u044b\u043b\u0430 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u0430 \u043a\u0430\u043a \u0441\u043e\u0441\u0442\u0430\u0432\u043d\u0430\u044f
|
||||
person.err.userCSV.noFile=\u0424\u0430\u0439\u043b\u044b \u043d\u0435 \u0431\u044b\u043b\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b
|
||||
person.err.userCSV.corruptFile=\u0414\u0430\u043d\u043d\u044b\u0439 \u0444\u0430\u0439\u043b \u0431\u044b\u043b \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d \u0438\u043b\u0438 \u0443\u0441\u0435\u0447\u0435\u043d
|
||||
person.err.userCSV.invalidForm=\u0414\u0430\u043D\u043D\u0430\u044F \u0444\u043E\u0440\u043C\u0430 \u043D\u0435 \u0431\u044B\u043B\u0430 \u043F\u0435\u0440\u0435\u0434\u0430\u043D\u0430 \u043A\u0430\u043A \u0441\u043E\u0441\u0442\u0430\u0432\u043D\u0430\u044F
|
||||
person.err.userCSV.noFile=\u0424\u0430\u0439\u043B\u044B \u043D\u0435 \u0431\u044B\u043B\u0438 \u043F\u0435\u0440\u0435\u0434\u0430\u043D\u044B
|
||||
person.err.userCSV.corruptFile=\u0414\u0430\u043D\u043D\u044B\u0439 \u0444\u0430\u0439\u043B \u0431\u044B\u043B \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0435\u043D \u0438\u043B\u0438 \u0443\u0441\u0435\u0447\u0435\u043D
|
||||
|
||||
person.err.userCSV.general=\u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0430 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0430
|
||||
person.err.userCSV.generalArgs=\u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0430 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0430: {0}
|
||||
person.err.userCSV.blankColumn=\u0421\u0442\u043e\u043b\u0431\u0435\u0446 {0} (\u043d\u043e\u043c\u0435\u0440 \u0441\u0442\u043e\u043b\u0431\u0446\u0430 {1}) \u043d\u0435 \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442, \u043d\u043e \u0431\u044b\u043b \u043f\u0443\u0441\u0442\u044b\u043c \u0432 \u0441\u0442\u0440\u043e\u043a\u0435 {2}
|
||||
person.err.userCSV.general=\u041F\u0440\u0438 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430
|
||||
person.err.userCSV.generalArgs=\u041F\u0440\u0438 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430: {0}
|
||||
person.err.userCSV.blankColumn=\u0421\u0442\u043E\u043B\u0431\u0435\u0446 {0} (\u043D\u043E\u043C\u0435\u0440 \u0441\u0442\u043E\u043B\u0431\u0446\u0430 {1}) \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u043C, \u043D\u043E \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0442\u0430\u043A\u043E\u0432\u044B\u043C \u0432 \u0441\u0442\u0440\u043E\u043A\u0435 {2}
|
||||
|
||||
person.msg.userCSV.created=\u0421\u043e\u0437\u0434\u0430\u043d \u0434\u043b\u044f {0}
|
||||
person.msg.userCSV.created=\u0421\u043E\u0437\u0434\u0430\u043D \u0434\u043B\u044F {0}
|
||||
person.msg.userCSV.existing=\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
|
||||
|
||||
@@ -6,11 +6,42 @@ function main()
|
||||
if (person == null)
|
||||
{
|
||||
// 404 since person resource could not be found
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid + " could not be found");
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid
|
||||
+ " could not be found");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
preferenceService.clearPreferences(userid, args["pf"]);
|
||||
}
|
||||
catch (error)
|
||||
{
|
||||
var msg = error.message;
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
{
|
||||
logger.log(msg);
|
||||
}
|
||||
|
||||
// determine if the exception was UnauthorizedAccessException, if so
|
||||
// return 401 status code
|
||||
if (msg.indexOf("UnauthorizedAccessException") != -1)
|
||||
{
|
||||
status.setCode(status.STATUS_UNAUTHORIZED, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 401 status code");
|
||||
}
|
||||
else
|
||||
{
|
||||
status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 500 status code");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
@@ -6,15 +6,47 @@ function main()
|
||||
if (person == null)
|
||||
{
|
||||
// 404 since person resource could not be found
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid + " could not be found");
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid
|
||||
+ " could not be found");
|
||||
return;
|
||||
}
|
||||
|
||||
var preferences = null;
|
||||
try
|
||||
{
|
||||
// Get the preferences for the person
|
||||
var preferences = preferenceService.getPreferences(userid, args["pf"]);
|
||||
|
||||
// Convert the preferences to JSON and place in the model
|
||||
model.preferences = jsonUtils.toJSONString(preferences);
|
||||
}
|
||||
catch (error)
|
||||
{
|
||||
var msg = error.message;
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
{
|
||||
logger.log(msg);
|
||||
}
|
||||
|
||||
// determine if the exception was UnauthorizedAccessException, if so
|
||||
// return 401 status code
|
||||
if (msg.indexOf("UnauthorizedAccessException") != -1)
|
||||
{
|
||||
status.setCode(status.STATUS_UNAUTHORIZED, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 401 status code");
|
||||
}
|
||||
else
|
||||
{
|
||||
status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 500 status code");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
@@ -6,15 +6,46 @@ function main()
|
||||
if (person == null)
|
||||
{
|
||||
// 404 since person resource could not be found
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid + " could not be found");
|
||||
status.setCode(status.STATUS_NOT_FOUND, "The user " + userid
|
||||
+ " could not be found");
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert the passed json into a native JS object
|
||||
var preferences = jsonUtils.toObject(json);
|
||||
|
||||
try
|
||||
{
|
||||
// Set the preferences
|
||||
preferenceService.setPreferences(userid, preferences);
|
||||
}
|
||||
catch (error)
|
||||
{
|
||||
var msg = error.message;
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
{
|
||||
logger.log(msg);
|
||||
}
|
||||
|
||||
// determine if the exception was UnauthorizedAccessException, if so
|
||||
// return 401 status code
|
||||
if (msg.indexOf("UnauthorizedAccessException") != -1)
|
||||
{
|
||||
status.setCode(status.STATUS_UNAUTHORIZED, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 401 status code");
|
||||
}
|
||||
else
|
||||
{
|
||||
status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
|
||||
|
||||
if (logger.isLoggingEnabled())
|
||||
logger.log("Returning 500 status code");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
@@ -1,6 +1,6 @@
|
||||
authForm.title=Alfresco » \u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e\u0431 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432
|
||||
authForm.heading=\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043a\u0430\u043d\u0430\u043b\u043e\u0432
|
||||
authForm.directions=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0432\u043e\u0438 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438 \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f {0}
|
||||
authForm.user=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f:
|
||||
authForm.password=\u041f\u0430\u0440\u043e\u043b\u044c:
|
||||
authForm.login=\u0412\u043e\u0439\u0442\u0438
|
||||
authForm.title=Alfresco » \u0421\u0432\u0435\u0434\u0435\u043D\u0438\u044F \u043E\u0431 \u0430\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u043A\u0430\u043D\u0430\u043B\u043E\u0432
|
||||
authForm.heading=\u0410\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u043A\u0430\u043D\u0430\u043B\u043E\u0432
|
||||
authForm.directions=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0432\u043E\u0438 \u0438\u043C\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F \u0438 \u043F\u0430\u0440\u043E\u043B\u044C \u0434\u043B\u044F {0}
|
||||
authForm.user=\u0418\u043C\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F:
|
||||
authForm.password=\u041F\u0430\u0440\u043E\u043B\u044C:
|
||||
authForm.login=\u0412\u043E\u0439\u0442\u0438
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
|
||||
calendar.err.event.not.found=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 JSON: {0}
|
||||
@@ -1,2 +1,2 @@
|
||||
calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
|
||||
calendar.err.event.not.found=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 JSON: {0}
|
||||
@@ -1,2 +1,2 @@
|
||||
calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
|
||||
calendar.err.event.not.found=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u0435: {0}
|
||||
calendar.err.invalid.json=\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 JSON: {0}
|
||||
@@ -88,6 +88,8 @@ var Common =
|
||||
* @return {object} Location object literal.
|
||||
*/
|
||||
getLocation: function Common_getLocation(node, libraryRoot)
|
||||
{
|
||||
try
|
||||
{
|
||||
var location = null,
|
||||
qnamePaths = node.qnamePath.split("/"),
|
||||
@@ -145,6 +147,11 @@ var Common =
|
||||
}
|
||||
|
||||
return location;
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -275,6 +282,11 @@ var ParseArgs =
|
||||
|
||||
// Parent location parameter adjustment
|
||||
location = Common.getLocation(pathNode, libraryRoot);
|
||||
if (location === null)
|
||||
{
|
||||
status.setCode(status.STATUS_GONE, "Location is 'null'. (No permission?)");
|
||||
return null;
|
||||
}
|
||||
if (path !== "")
|
||||
{
|
||||
location.path = ParseArgs.combinePaths(location.path, location.file);
|
||||
|
||||
@@ -29,7 +29,7 @@ function runAction(p_params)
|
||||
var workingCopy = assetNode.checkout();
|
||||
if (workingCopy === null)
|
||||
{
|
||||
status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, "Could not checkout: " + p_params.path);
|
||||
status.setCode(status.STATUS_FORBIDDEN, "Could not checkout: " + p_params.path);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1034,7 +1034,7 @@ function getQueryTemplate()
|
||||
template: "%(cm:name cm:title cm:description ia:whatEvent ia:descriptionEvent lnk:title lnk:description TEXT TAG)"
|
||||
}],
|
||||
qt = new XML(config.script)["default-query-template"];
|
||||
if (qt != null && qt.length != 0)
|
||||
if (qt != null && qt.length() != 0)
|
||||
{
|
||||
t[0].template = qt.toString();
|
||||
}
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
page-moved=\u042d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0435\u043d\u0430
|
||||
page-moved-here=\u0441\u044e\u0434\u0430
|
||||
page-not-found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430
|
||||
page-moved=\u042D\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u0430
|
||||
page-moved-here=\u0441\u044E\u0434\u0430
|
||||
@@ -1 +1 @@
|
||||
page-not-found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0441\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a\u0430
|
||||
page-not-found=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 \u0441\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u0438\u043A\u0430
|
||||
@@ -568,8 +568,8 @@ public class SiteActivitySystemTest extends TestCase
|
||||
getUserFeed(null, site3, ticket, false, false, false, 6);
|
||||
|
||||
getUserFeed(null, null, ticket, false, false, false, 14); // no filter
|
||||
getUserFeed(null, null, ticket, false, true, false, 14); // exclude any from user1
|
||||
getUserFeed(null, null, ticket, false, false, true, 0); // exclude all except user1
|
||||
getUserFeed(null, null, ticket, false, true, false, 12); // exclude any from user1
|
||||
getUserFeed(null, null, ticket, false, false, true, 2); // exclude all except user1
|
||||
getUserFeed(null, null, ticket, false, true, true, 0); // exclude all (NOOP)
|
||||
|
||||
// TODO - add more (eg. other non-admin user activities)
|
||||
|
||||
@@ -67,6 +67,9 @@ public abstract class AbstractCalendarListingWebScript extends AbstractCalendarW
|
||||
String startA = (String)resultA.get(RESULT_START);
|
||||
String startB = (String)resultB.get(RESULT_START);
|
||||
|
||||
startA = startA.replace("Z", "+00:00");
|
||||
startB = startB.replace("Z", "+00:00");
|
||||
|
||||
//check and parse iso8601 date without time zone (All day events are stripped of time zone)
|
||||
DateTime sa = startA.length()>23?fmtTz.parseDateTime(startA):fmtNoTz.parseDateTime(startA);
|
||||
DateTime sb = startB.length()>23?fmtTz.parseDateTime(startB):fmtNoTz.parseDateTime(startB);
|
||||
|
||||
@@ -805,7 +805,7 @@ public class StreamContent extends AbstractWebScript implements ResourceLoaderAw
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Attaching content using filename: " + attachFileName);
|
||||
|
||||
headerValue += "; filename*=UTF-8''" + WebDAVHelper.encodeURL(attachFileName) + "; filename=\"" + attachFileName + "\"";
|
||||
headerValue += "; filename=\"" + attachFileName + "\"; filename*=UTF-8''" + WebDAVHelper.encodeURL(attachFileName);
|
||||
}
|
||||
|
||||
// set header based on filename - will force a Save As from the browse if it doesn't recognize it
|
||||
|
||||
@@ -194,12 +194,17 @@ public class GetMethod extends WebDAVMethod
|
||||
}
|
||||
|
||||
String fname = (String) getNodeService().getProperty(nodeInfo.getLinkNodeRef(), ContentModel.PROP_NAME);
|
||||
String webDavUrl = m_request.getServerName() + ":" + m_request.getServerPort() + rootURL + WebDAVHelper.encodeURL(fname, m_userAgent);
|
||||
|
||||
StringBuilder urlStr = new StringBuilder();
|
||||
StringBuilder urlStr = new StringBuilder(200);
|
||||
urlStr.append("[InternetShortcut]\r\n");
|
||||
urlStr.append("URL=file://");
|
||||
urlStr.append(webDavUrl);
|
||||
urlStr.append(m_request.getServerName());
|
||||
// Only append the port if it is non-default for compatibility with XP
|
||||
int port = m_request.getServerPort();
|
||||
if (port != 80)
|
||||
{
|
||||
urlStr.append(":").append(port);
|
||||
}
|
||||
urlStr.append(rootURL).append(WebDAVHelper.encodeURL(fname, m_userAgent));
|
||||
urlStr.append("\r\n");
|
||||
|
||||
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, "text/plain; charset=ISO-8859-1");
|
||||
|
||||
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.alfresco.jlan.util.IPAddress;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.lock.LockUtils;
|
||||
import org.alfresco.repo.tenant.TenantService;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.action.ActionService;
|
||||
@@ -960,4 +961,16 @@ public class WebDAVHelper
|
||||
|
||||
return strPath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicates if the node is unlocked or the current user has a WRITE_LOCK<p>
|
||||
*
|
||||
* @see LockService#isLockedOrReadOnly(NodeRef)
|
||||
*
|
||||
* @param nodeRef the node reference
|
||||
*/
|
||||
public boolean isLockedOrReadOnly(final NodeRef nodeRef)
|
||||
{
|
||||
return LockUtils.isLockedOrReadOnly(nodeRef, m_serviceRegistry.getLockService());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,8 +64,6 @@ import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.search.SearchService;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.cmr.site.SiteInfo;
|
||||
import org.alfresco.service.cmr.site.SiteService;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.TempFileProvider;
|
||||
@@ -1006,52 +1004,24 @@ public abstract class WebDAVMethod
|
||||
protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException
|
||||
{
|
||||
LockInfo nodeLockInfo = getNodeLockInfo(fileInfo);
|
||||
|
||||
nodeLockInfo.getRWLock().readLock().lock();
|
||||
try
|
||||
{
|
||||
String nodeETag = getDAVHelper().makeQuotedETag(fileInfo);
|
||||
NodeRef nodeRef = fileInfo.getNodeRef();
|
||||
|
||||
|
||||
// Handle the case where there are no conditions and no lock token stored on the node. Node just needs to be writable with no shared locks
|
||||
if (m_conditions == null)
|
||||
{
|
||||
if (!nodeLockInfo.isLocked())
|
||||
{
|
||||
// Not locked
|
||||
return nodeLockInfo;
|
||||
}
|
||||
|
||||
if (nodeLockInfo.isShared())
|
||||
{
|
||||
if (nodeLockInfo.getSharedLockTokens().isEmpty())
|
||||
{
|
||||
// Although flagged as shared - no shared locks.
|
||||
return nodeLockInfo;
|
||||
}
|
||||
if (!ignoreShared)
|
||||
{
|
||||
// Shared locks exist
|
||||
throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// ALF-3681 fix. WebDrive 10 client doesn't send If header when locked resource is updated so check the node by lockOwner.
|
||||
if (m_userAgent != null && m_userAgent.equals(WebDAV.AGENT_MICROSOFT_DATA_ACCESS_INTERNET_PUBLISHING_PROVIDER_DAV))
|
||||
if (!nodeLockInfo.isExclusive() || (m_userAgent != null && m_userAgent.equals(WebDAV.AGENT_MICROSOFT_DATA_ACCESS_INTERNET_PUBLISHING_PROVIDER_DAV)))
|
||||
{
|
||||
String currentUser = getAuthenticationService().getCurrentUserName();
|
||||
String lockOwner = nodeLockInfo.getOwner();
|
||||
if (lockOwner.equals(currentUser))
|
||||
if (getDAVHelper().isLockedOrReadOnly(nodeRef) || (!ignoreShared && nodeLockInfo.isShared() && !nodeLockInfo.getSharedLockTokens().isEmpty()))
|
||||
{
|
||||
// OK to write - lock is owned by current user.
|
||||
return nodeLockInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Exclusive lock, owned by someone else
|
||||
throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
|
||||
}
|
||||
}
|
||||
return nodeLockInfo;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user