inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

node locking enhancements and fixes (#955)

Browse Source 
* optimize image resolver

* allow previewing locked files

* allow selecting locked nodes

* fix comments and metadata tabs

* improved lock checks

* remove obsolete "experimental" directive
This commit is contained in:
Denys Vuika
2019-02-15 18:36:51 +00:00
committed by GitHub
parent 46c8062f2f
commit 4cde12dfee
40 changed files with 69 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/adf-office-services-ext/src/lib/aos-extension.service.ts
View File

@@ -26,7 +26,9 @@ export class AosEditOnlineService {
// const checkedOut = node.aspectNames.find(
// (aspect: string) => aspect === 'cm:checkedOut'
// );
const checkedOut = node.properties['cm:lockType'] === 'WRITE_LOCK';
const checkedOut =
node.properties['cm:lockType'] === 'WRITE_LOCK' ||
node.properties['cm:lockType'] === 'READ_ONLY_LOCK';
const lockOwner = node.properties['cm:lockOwner'];
const differentLockOwner =
lockOwner.id !== this.alfrescoAuthenticationService.getEcmUsername();

5
projects/adf-office-services-ext/src/lib/evaluators.ts
View File

@@ -32,7 +32,10 @@ export function canOpenWithOffice(
}
*/
if (file.entry.properties['cm:lockType'] === 'WRITE_LOCK') {
if (
file.entry.properties['cm:lockType'] === 'WRITE_LOCK' ||
file.entry.properties['cm:lockType'] === 'READ_ONLY_LOCK'
) {
return false;
}