Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
fabeb78f by Mark at 2016-09-12T16:05:36+02:00
CHANNELMGR-841 holderId and holderName
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -210,12 +210,11 @@ export class HippoIframeCtrl {
}
contentIsLocked(contentLink) {
- return typeof contentLink.metaData.holder !== 'undefined'; // TODO:
replace when HSTTWO-3797 is complete
+ return typeof contentLink.metaData.holderId !== 'undefined';
}
openContent(contentLink) {
- const holder = contentLink.metaData.holder; // TODO: replace when
HSTTWO-3797 is complete
- if (this.contentIsLocked(contentLink) && holder && holder.userName !==
this.config.cmsUser) {
+ if (this.contentIsLocked(contentLink) && contentLink.metaData.holderId !==
this.config.cmsUser) {
this.CmsService.publish('open-content', contentLink.getUuid());
} else {
this.ChannelSidePanelService.open('right');
@@ -225,7 +224,7 @@ export class HippoIframeCtrl {
getContentLinkTooltip(contentLink) {
let result;
if (this.contentIsLocked(contentLink)) {
- result = this.$translate.instant('LOCKED_BY', { user:
contentLink.metaData.holder.userName });
+ result = this.$translate.instant('LOCKED_BY', { user:
contentLink.metaData.holderName });
} else {
result = this.$translate.instant('EDIT_CONTENT');
}
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=====================================
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -197,9 +197,7 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('<!-- { "HST-Type": "CONTENT_LINK" -->')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
- userName: 'test',
- }, // TODO: replace when HSTTWO-3797 is complete
+ holderId: 'test',
});
let locked = hippoIframeCtrl.contentIsLocked(contentLink);
@@ -211,9 +209,7 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('<!-- { "HST-Type": "CONTENT_LINK" -->')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
- userName: 'differentUser',
- },
+ holderName: 'differentUser',
});
hippoIframeCtrl.config = {
cmsUser: 'test',
@@ -255,15 +251,13 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('<!-- { "HST-Type": "CONTENT_LINK" -->')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
- userName: 'test',
- }
+ holderName: 'test',
});
spyOn(hippoIframeCtrl, 'contentIsLocked').and.returnValue(true);
let tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
- expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: contentLink.metaData.holder.userName });
+ expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: contentLink.metaData.holderName });
});
it('calls the registered callback for editing a menu', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fabeb78f98fc06aebb8bcbf6d3b21a38ebdf1b6d
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
