Bert Leunis pushed to branch feature/create-content at cms-community / hippo-addon-channel-manager
Commits: c2ec7675 by Michael Metternich at 2018-01-21T16:28:59+01:00 CHANNELMGR-1685 Manage content buttons now visible when locked by user - - - - - ac74b642 by Bert Leunis at 2018-01-22T10:41:13+01:00 CHANNELMGR-1685 small code fix; update license headers - - - - - 941b4ac4 by Bert Leunis at 2018-01-22T10:43:24+01:00 CHANNELMGR-1685 Merge feature/create-content changes in bugfix/CHANNELMGR-1685 - - - - - bdc61078 by Bert Leunis at 2018-01-22T11:21:08+01:00 CHANNELMGR-1685 Reintegrate bugfix/CHANNELMGR-1685 - - - - - 3 changed files: - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js - frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js Changes: ===================================== frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html ===================================== --- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html +++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html @@ -1,5 +1,5 @@ <!-- - ~ Copyright 2016-2017 Hippo B.V. (http://www.onehippo.com) + ~ Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com) ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -246,6 +246,25 @@ } --> </p> </div> + + <!-- Locked container --> + <!-- { + "HST-Type": "CONTAINER_COMPONENT", + "HST-Label": "vBox locked container", + "HST-XType": "HST.vBox", + "uuid": "container-vbox-locked", + "HST-LockedBy": "user", + "HST-LockedBy-Current-User": "true" + } --> + <div id="container-vbox-locked-self" class="hst-container"> + <p id="manage-content-scenario-9"> + <!-- { + "HST-Type": "MANAGE_CONTENT_LINK", + "templateQuery": "manage-content-template-query", + "componentParameter": "manage-content-component-parameter" + } --> + </p> + </div> <!-- { "HST-End": "true", "uuid": "container-vbox-locked" ===================================== frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js ===================================== --- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js +++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js @@ -449,7 +449,9 @@ class OverlayService { } } - if (structureElement.getEnclosingElement().isLocked() && componentParameter) { + if (config.containerItem.isLocked() + && componentParameter + && !config.containerItem.isLockedByCurrentUser()) { if (!documentUuid) { return {}; } ===================================== frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js ===================================== --- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js +++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js @@ -211,13 +211,13 @@ describe('OverlayService', () => { it('generates overlay elements', (done) => { loadIframeFixture(() => { // Total overlay elements - expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(19); + expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(21); expect(iframe('.hippo-overlay > .hippo-overlay-element-component').length).toBe(4); - expect(iframe('.hippo-overlay > .hippo-overlay-element-container').length).toBe(5); + expect(iframe('.hippo-overlay > .hippo-overlay-element-container').length).toBe(6); expect(iframe('.hippo-overlay > .hippo-overlay-element-content-link').length).toBe(1); expect(iframe('.hippo-overlay > .hippo-overlay-element-menu-link').length).toBe(1); - expect(iframe('.hippo-overlay > .hippo-overlay-element-manage-content-link').length).toBe(8); + expect(iframe('.hippo-overlay > .hippo-overlay-element-manage-content-link').length).toBe(9); done(); }); }); @@ -276,7 +276,7 @@ describe('OverlayService', () => { it('only renders labels for structure elements that have a label', (done) => { loadIframeFixture(() => { expect(iframe('.hippo-overlay > .hippo-overlay-element-component > .hippo-overlay-label').length).toBe(4); - expect(iframe('.hippo-overlay > .hippo-overlay-element-container > .hippo-overlay-label').length).toBe(5); + expect(iframe('.hippo-overlay > .hippo-overlay-element-container > .hippo-overlay-label').length).toBe(6); expect(iframe('.hippo-overlay > .hippo-overlay-element-link > .hippo-overlay-label').length).toBe(0); const emptyContainer = iframe('.hippo-overlay-element-container').eq(2); @@ -288,7 +288,7 @@ describe('OverlayService', () => { it('renders the name structure elements in a data-qa-name attribute', (done) => { loadIframeFixture(() => { expect(iframe('.hippo-overlay > .hippo-overlay-element-component > .hippo-overlay-label[data-qa-name]').length).toBe(4); - expect(iframe('.hippo-overlay > .hippo-overlay-element-container > .hippo-overlay-label[data-qa-name]').length).toBe(5); + expect(iframe('.hippo-overlay > .hippo-overlay-element-container > .hippo-overlay-label[data-qa-name]').length).toBe(6); const emptyContainer = iframe('.hippo-overlay-element-container').eq(2); expect(emptyContainer.find('.hippo-overlay-label').attr('data-qa-name')).toBe('Empty container'); @@ -586,7 +586,7 @@ describe('OverlayService', () => { OverlayService.showComponentsOverlay(true); loadIframeFixture(() => { - expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(19); + expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(21); expect(iframe('.hippo-overlay > .hippo-overlay-element-menu-link').length).toBe(1); const componentMarkupWithoutMenuLink = ` @@ -599,7 +599,7 @@ describe('OverlayService', () => { PageStructureService.renderComponent('aaaa'); $rootScope.$digest(); - expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(18); + expect(iframe('.hippo-overlay > .hippo-overlay-element').length).toBe(20); expect(iframe('.hippo-overlay > .hippo-overlay-element-menu-link').length).toBe(0); done(); @@ -876,7 +876,7 @@ describe('OverlayService', () => { }); describe('when container is locked', () => { - it('alway shows an edit button when documentUuid is set', (done) => { + it('always shows an edit button even when locked', (done) => { manageContentScenario(7, (mainButton, optionButtons) => { expect(mainButton.hasClass('qa-edit-content')).toBe(true); expect(mainButton.attr('title')).toBe('EDIT_CONTENT'); @@ -897,6 +897,21 @@ describe('OverlayService', () => { done(); }); }); + + it('shows everything when locked by current user', (done) => { + manageContentScenario(5, (mainButton, optionButtons) => { + expect(mainButton.hasClass('qa-add-content')).toBe(true); + expect(mainButton.attr('title')).toBe('CREATE_DOCUMENT'); + + mainButton.trigger('mouseenter'); + expect(mainButton.attr('title')).toBe('CANCEL'); + expect(optionButtons.children().length).toBe(2); + expect(optionButtons.children()[0].getAttribute('title')).toBe('CREATE_DOCUMENT'); + expect(optionButtons.children()[1].getAttribute('title')).toBe('SELECT_DOCUMENT'); + done(); + }); + }); + }); describe('setting fab button callback and enabling hover', () => { View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/b9e0c86249ebc561598f70fbd699ddfd45aa30e6...bdc61078f6c4ed0716171dd20bbd171187f02490 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/b9e0c86249ebc561598f70fbd699ddfd45aa30e6...bdc61078f6c4ed0716171dd20bbd171187f02490 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
