[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1703
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-1703 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1703 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/HCM-240] HCM-240 Update copyright year on changed files
Peter Centgraf pushed to branch feature/HCM-240 at cms-community / hippo-configuration-management Commits: 9c8785a1 by Peter Centgraf at 2018-02-06T17:22:59+01:00 HCM-240 Update copyright year on changed files - - - - - 3 changed files: - model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java - model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java - model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java Changes: = model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java = --- a/model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java +++ b/model/src/main/java/org/onehippo/cm/model/impl/definition/ActionItemImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. = model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java = --- a/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java +++ b/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. = model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java = --- a/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java +++ b/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/commit/9c8785a1bd341e27e05828645055d278f38d07f5 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/commit/9c8785a1bd341e27e05828645055d278f38d07f5 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management] Deleted branch feature/HCM-241
Peter Centgraf deleted branch feature/HCM-241 at cms-community / hippo-configuration-management --- 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][master] 4 commits: HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME…
Peter Centgraf pushed to branch master at cms-community /
hippo-configuration-management
Commits:
43988d05 by Peter Centgraf at 2017-12-29T10:37:31+01:00
HCM-241 Use singleton anonymous subclasses for JcrPaths.ROOT and ROOT_NAME
instead of depending on instance equality
- - - - -
592b1aa6 by Peter Centgraf at 2018-02-06T17:12:44+01:00
HCM-241 merge master
- - - - -
76d9d30e by Peter Centgraf at 2018-02-06T17:15:52+01:00
HCM-241 Update copyright year on changed files
- - - - -
818608dc by Peter Centgraf at 2018-02-06T17:16:36+01:00
HCM-241 reintegrate feature/HCM-241
- - - - -
4 changed files:
- model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java
- model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java
- model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java
- model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java
Changes:
=
model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java
=
--- a/model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java
+++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017,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.
@@ -60,7 +60,8 @@ class JcrPathImpl implements JcrPath {
@Override
public boolean isRoot() {
-return this == JcrPaths.ROOT;
+// default return value is false, but ROOT overrides this to return
true
+return false;
}
@Override
@@ -85,7 +86,7 @@ class JcrPathImpl implements JcrPath {
}
if (segments.size() == 1) {
-return JcrPaths.ROOT;
+return getRoot();
}
// todo: implement this in a more memory-efficient way with Lisp-style
list objects
@@ -105,7 +106,7 @@ class JcrPathImpl implements JcrPath {
@Override
public org.onehippo.cm.model.path.JcrPath subpath(final int beginIndex,
final int endIndex) {
if (beginIndex == 0 && endIndex == 0) {
-return JcrPaths.ROOT;
+return getRoot();
}
return new JcrPathImpl(segments.subList(beginIndex, endIndex),
beginIndex == 0);
=
model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java
=
--- a/model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java
+++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017,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.
@@ -93,7 +93,8 @@ class JcrPathSegmentImpl implements JcrPathSegment {
@Override
public boolean isRoot() {
-return this == JcrPaths.ROOT_NAME;
+// default return value is false, but ROOT_NAME overrides this to
return true
+return false;
}
@Override
=
model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java
=
--- a/model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java
+++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017,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.
@@ -35,12 +35,22 @@ public class JcrPaths {
/**
* A constant value representing the path of the JCR root node.
*/
-public static final JcrPath ROOT = new JcrPathImpl(ImmutableList.of(),
false, true);
+public static final JcrPath ROOT = new JcrPathImpl(ImmutableList.of(),
false, true) {
+@Override
+public boolean isRoot() {
+return true;
+}
+};
/**
* A constant value representing the name of the JCR root node, which
typically does not appear explicitly in a {@link
org.onehippo.cm.model.impl.path.JcrPath}.
*/
-public static final JcrPathSegment ROOT_NAME = new JcrPathSegmentImpl("",
0);
+public static final JcrPathSegment ROOT_NAME = new JcrPathSegmentImpl("",
0) {
+@Override
+public boolean isRoot() {
+return true;
+}
+};
/**
* Static factory for JcrPath instances.
=
model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java
=
---
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/HCM-241] 3 commits: HCM-15 Update copyright year of NOTICE file to 2018
Peter Centgraf pushed to branch feature/HCM-241 at cms-community / hippo-configuration-management Commits: df9ece36 by Arent-Jan Banck at 2018-01-23T21:20:00+01:00 HCM-15 Update copyright year of NOTICE file to 2018 - - - - - 592b1aa6 by Peter Centgraf at 2018-02-06T17:12:44+01:00 HCM-241 merge master - - - - - 76d9d30e by Peter Centgraf at 2018-02-06T17:15:52+01:00 HCM-241 Update copyright year on changed files - - - - - 5 changed files: - NOTICE - model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java - model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java - model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java - model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java Changes: = NOTICE = --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo Configuration Management -Copyright 2016-2017 Hippo B.V. (http://www.onehippo.com) +Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); = model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java = --- a/model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java +++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPathImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. = model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java = --- a/model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java +++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPathSegmentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. = model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java = --- a/model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java +++ b/model/src/main/java/org/onehippo/cm/model/path/JcrPaths.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. = model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java = --- a/model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java +++ b/model/src/main/java/org/onehippo/cm/model/util/ConfigurationModelUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017,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. View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/43988d05c3d814563fe21a4c4fe3d8df85a8d8fe...76d9d30e5a4aa1698ac6d053ec0f872544bf78f3 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-configuration-management/compare/43988d05c3d814563fe21a4c4fe3d8df85a8d8fe...76d9d30e5a4aa1698ac6d053ec0f872544bf78f3 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
[HippoCMS-scm] [Git][cms-community/hippo-configuration-management][feature/HCM-240] HCM-240 Update ActionListParser to explicitly check path uniqueness
Peter Centgraf pushed to branch feature/HCM-240 at cms-community /
hippo-configuration-management
Commits:
eb36465c by Peter Centgraf at 2018-02-06T17:07:16+01:00
HCM-240 Update ActionListParser to explicitly check path uniqueness
- - - - -
2 changed files:
- model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
- model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
Changes:
=
model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
=
--- a/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
+++ b/model/src/main/java/org/onehippo/cm/model/parser/ActionListParser.java
@@ -16,6 +16,7 @@
package org.onehippo.cm.model.parser;
import java.io.InputStream;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@@ -67,12 +68,14 @@ public class ActionListParser extends AbstractBaseParser {
protected Set collectActionItems(final Node node) throws
ParserException {
final Set actionItems = new LinkedHashSet<>();
+final Set paths = new HashSet<>();
for (NodeTuple tuple : asTuples(node)) {
final String path = asPathScalar(tuple.getKeyNode(), true, false);
final ActionItem actionItem = asActionItem(tuple.getValueNode(),
path);
-if (!actionItems.add(actionItem)) {
-throw new RuntimeException(String.format("Duplicate items are
not allowed: %s", actionItem));
+if (!paths.add(actionItem.getPath())) {
+throw new ParserException(String.format("Duplicate paths are
not allowed in the same version: %s", actionItem.getPath()));
}
+actionItems.add(actionItem);
}
return actionItems;
}
@@ -81,7 +84,7 @@ public class ActionListParser extends AbstractBaseParser {
String action = asStringScalar(node);
ActionType type = ActionType.valueOf(StringUtils.upperCase(action));
if (type == ActionType.APPEND) {
-throw new RuntimeException("APPEND action type can't be specified
in action lists file");
+throw new ParserException("APPEND action type can't be specified
in action lists file");
}
return new ActionItemImpl(path, type);
}
=
model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
=
--- a/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
+++ b/model/src/test/java/org/onehippo/cm/model/parser/ActionListParserTest.java
@@ -63,6 +63,37 @@ public class ActionListParserTest extends AbstractBaseTest {
}
@Test
+public void expect_error_for_append_action() {
+final String yaml =
+"action-lists:\n" +
+"- 1.0:\n" +
+"/content/dup: append\n";
+
+try {
+parseActionMap(yaml);
+fail("Expected exception");
+} catch (ParserException e) {
+assertEquals("APPEND action type can't be specified in action
lists file", e.getMessage());
+}
+}
+
+@Test
+public void expect_error_for_duplicate_path() {
+final String yaml =
+"action-lists:\n" +
+"- 1.0:\n" +
+"/content/dup: delete\n" +
+"/content/dup: reload\n";
+
+try {
+parseActionMap(yaml);
+fail("Expected exception");
+} catch (ParserException e) {
+assertEquals("Duplicate paths are not allowed in the same version:
/content/dup", e.getMessage());
+}
+}
+
+@Test
public void expect_error_when_using_not_absolute_path() {
final String yaml =
"action-lists:\n" +
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-configuration-management/commit/eb36465ceed75de4cb6c61c4cdfcec9924e17040
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-configuration-management/commit/eb36465ceed75de4cb6c61c4cdfcec9924e17040
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 2 commits: CHANNELMGR-1696 set the root path to the channel content path when it is missing…
Bert Leunis pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
5a76e83a by Bert Leunis at 2018-02-06T16:30:17+01:00
CHANNELMGR-1696 set the root path to the channel content path when it is
missing but there is a default path
Developers can configure the manageContent tag without a rootPath but with a
defaultPath. This suggests a location for new documents within a channel root,
but it will work within any channel. In those cases the document location field
is populated with the channel content path as root path plus the default path.
- - - - -
d473b16c by Bert Leunis at 2018-02-06T16:30:17+01:00
CHANNELMGR-1696 Reintegrate feature/CHANNELMGR-1696
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.js
@@ -40,6 +40,10 @@ class DocumentLocationFieldController {
throw new Error(`The defaultPath option can only be a relative path:
${this.defaultPath}`);
}
+if (!this.rootPath && this.defaultPath) {
+ this.rootPath = this.ChannelService.getChannel().contentRoot;
+}
+
this.initialPickerPath = this.rootPath ||
this.ChannelService.getChannel().contentRoot;
this.pickerPath = '/';
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.spec.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.controller.spec.js
@@ -241,23 +241,59 @@ describe('DocumentLocationField', () => {
describe('without root path', () => {
-describe('$onInit', () => {
- it('sets the initialPickerPath to the channel content root', () => {
-component.$onInit();
-expect(component.initialPickerPath).toBe('/channel/content');
+describe('and without default path', () => {
+ describe('$onInit', () => {
+it('sets the initialPickerPath to the channel content root', () => {
+ component.$onInit();
+ expect(component.initialPickerPath).toBe('/channel/content');
+});
+
+it('does not set the rootPath', () => {
+ component.$onInit();
+ expect(component.rootPath).toBeUndefined();
+});
+
+it('sets the default picker config', () => {
+ component.$onInit();
+ expect(component.pickerPath).toBe('/');
+ expect(component.pickerConfig).toEqual({
+configuration: 'cms-pickers/folders',
+rootPath: '/channel/content',
+selectableNodeTypes: ['hippostd:folder'],
+ });
+});
});
+});
- it('sets the default picker config', () => {
-component.$onInit();
-expect(component.pickerPath).toBe('/');
-expect(component.pickerConfig).toEqual({
- configuration: 'cms-pickers/folders',
- rootPath: '/channel/content',
- selectableNodeTypes: ['hippostd:folder'],
+describe('but with default path', () => {
+ describe('$onInit', () => {
+beforeEach(() => {
+ component.defaultPath = 'default/path';
+});
+
+it('sets the initialPickerPath to the channel content root', () => {
+ component.$onInit();
+ expect(component.initialPickerPath).toBe('/channel/content');
+});
+
+it('does set the rootPath', () => {
+ component.$onInit();
+ expect(component.rootPath).toBe('/channel/content');
+});
+
+it('sets the default picker config with root path of channel path plus
default path', () => {
+ component.$onInit();
+ expect(component.pickerPath).toBe('/');
+ expect(component.pickerConfig).toEqual({
+configuration: 'cms-pickers/folders',
+rootPath: '/channel/content',
+selectableNodeTypes: ['hippostd:folder'],
+ });
});
});
});
+
describe('onPathPicked', () => {
beforeEach(() => {
component.initialPickerPath = '/channel/content';
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1703 Record own change after picking component path
Arthur Bogaart pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
a1c8b192 by Arthur Bogaart at 2018-02-06T15:32:40+01:00
CHANNELMGR-1703 Record own change after picking component path
This will show the publish exclamation mark and enable the publish button in
the dropdown menu.
- - - - -
2 changed files:
- 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.js
=
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
@@ -590,6 +590,9 @@ class OverlayService {
.then(() => {
this.PageStructureService.renderComponent(component.getId());
this.FeedbackService.showNotification('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{ componentName });
+
+// record own change to enable the publish button in the application
toolbar
+this.ChannelService.recordOwnChange();
})
.catch(() => {
this.FeedbackService.showError('ERROR_DOCUMENT_SELECTED_FOR_COMPONENT', {
componentName });
=
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
@@ -569,6 +569,7 @@ describe('OverlayService', () => {
spyOn(HstComponentService, 'pickPath').and.returnValue($q.resolve());
spyOn(PageStructureService, 'renderComponent');
spyOn(FeedbackService, 'showNotification');
+spyOn(ChannelService, 'recordOwnChange');
loadIframeFixture(() => {
const overlayElementScenario5 =
iframe('.hippo-overlay-element-manage-content-link')[4];
@@ -584,6 +585,7 @@ describe('OverlayService', () => {
expect(FeedbackService.showNotification).toHaveBeenCalledWith('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{
componentName: 'component B',
});
+ expect(ChannelService.recordOwnChange).toHaveBeenCalled();
done();
});
@@ -620,6 +622,7 @@ describe('OverlayService', () => {
spyOn(HstComponentService, 'pickPath').and.returnValue($q.resolve());
spyOn(PageStructureService, 'renderComponent');
spyOn(FeedbackService, 'showNotification');
+spyOn(ChannelService, 'recordOwnChange');
loadIframeFixture(() => {
const overlayElementScenario7 =
iframe('.hippo-overlay-element-manage-content-link')[6];
@@ -635,6 +638,7 @@ describe('OverlayService', () => {
expect(FeedbackService.showNotification).toHaveBeenCalledWith('NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT',
{
componentName: 'Component with experiment',
});
+ expect(ChannelService.recordOwnChange).toHaveBeenCalled();
done();
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a1c8b192a5e538bc2cae81cc9f414ce5ce4bc403
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a1c8b192a5e538bc2cae81cc9f414ce5ce4bc403
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1703
Arthur Bogaart deleted branch bugfix/CHANNELMGR-1703 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1703
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-1703 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1703 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][bugfix/CMS-11063] CMS-11063 Click --> Klik, in Dutch
Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms-translations Commits: 5681ee77 by Jeroen Hoffman at 2018-02-06T14:25:16+01:00 CMS-11063 Click -- Klik, in Dutch - - - - - 1 changed file: - hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties Changes: = hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties = --- a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties +++ b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties @@ -6,5 +6,5 @@ set-to-current-date-tooltip=Klik om de huidige datum en tijdstip in te stellen date-label=Datum picker-format=d-M- set-to-current-date=Huidige datum en tijd -set-to-current-date-only-tooltip=Click om de huidige datum te gebruiken +set-to-current-date-only-tooltip=Klik om de huidige datum te gebruiken set-to-current-date-only=Zet op vandaag View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/commit/5681ee77dc4e5530364b620740509542c8bb6013 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/commit/5681ee77dc4e5530364b620740509542c8bb6013 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][bugfix/CMS-11063] CMS-11063 Error in calendardate field in hippo
Marijan Milicevic pushed to branch bugfix/CMS-11063 at cms-community /
hippo-cms-translations
Commits:
d70ec7a4 by Marijan Milicevic at 2018-02-06T14:17:09+01:00
CMS-11063 Error in calendardate field in hippo
- add already translated labels
- - - - -
6 changed files:
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
-
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_zh.properties
Changes:
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
@@ -29,25 +29,13 @@
"status" : "CLEAN",
"locales" : null
},
-"set-to-current-date-only-tooltip" : {
- "status" : "ADDED",
- "locales" : {
-"de" : "UNRESOLVED",
-"fr" : "UNRESOLVED",
-"nl" : "UNRESOLVED",
-"zh" : "UNRESOLVED",
-"es" : "UNRESOLVED"
- }
-},
-"set-to-current-date-only" : {
- "status" : "ADDED",
- "locales" : {
-"de" : "UNRESOLVED",
-"fr" : "UNRESOLVED",
-"nl" : "UNRESOLVED",
-"zh" : "UNRESOLVED",
-"es" : "UNRESOLVED"
- }
+"set-to-current-date-only-tooltip": {
+ "status": "CLEAN",
+ "locales": null
+},
+"set-to-current-date-only": {
+ "status": "CLEAN",
+ "locales": null
}
}
}
\ No newline at end of file
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
@@ -6,3 +6,5 @@ set-to-current-date-tooltip=Klicken, um aktuelle(s) Datum und
Zeit einzustellen
date-label=Datum
picker-format=d-M-
set-to-current-date=Aktuelles Datum und Zeit
+set-to-current-date-only-tooltip=Klicken, um aktuelles Datum einzustellen
+set-to-current-date-only=Auf Heute einstellen
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
@@ -6,3 +6,5 @@ set-to-current-date-tooltip=Haga clic para configurar hora y
fecha actual
date-label=Fecha
picker-format=d/M/
set-to-current-date=Establecer en ahora
+set-to-current-date-only-tooltip=Haga clic para ajustar la fecha actual
+set-to-current-date-only=Fijado a hoy
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
@@ -6,3 +6,5 @@ set-to-current-date-tooltip=Cliquez pour mettre date et heure
courantes
date-label=Date
picker-format=d-M-
set-to-current-date=Date et heure courantes
+set-to-current-date-only-tooltip=Cliquez pour mettre date et heure actuelles
+set-to-current-date-only=R\u00E9gler pour aujourd'hui
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
@@ -6,3 +6,5 @@ set-to-current-date-tooltip=Klik om de huidige datum en
tijdstip in te stellen
date-label=Datum
picker-format=d-M-
set-to-current-date=Huidige datum en tijd
+set-to-current-date-only-tooltip=Click om de huidige datum te gebruiken
+set-to-current-date-only=Zet op vandaag
=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_zh.properties
=
---
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-4201 make sure during integration tests the hst rootpath property is known
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
3497f0b5 by Ard Schrijvers at 2018-02-06T13:07:18+01:00
HSTTWO-4201 make sure during integration tests the hst rootpath property is
known
- - - - -
1 changed file:
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/AbstractFullRequestCycleTest.java
Changes:
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/AbstractFullRequestCycleTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/AbstractFullRequestCycleTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/AbstractFullRequestCycleTest.java
@@ -66,7 +66,9 @@ public class AbstractFullRequestCycleTest {
@Before
public void setUp() throws Exception {
-componentManager = new SpringComponentManager(new
PropertiesConfiguration());
+final PropertiesConfiguration configuration = new
PropertiesConfiguration();
+configuration.setProperty("hst.configuration.rootPath", "/hst:hst");
+componentManager = new SpringComponentManager(configuration);
componentManager.setConfigurationResources(getConfigurations());
servletContext.setContextPath("/site");
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/3497f0b566544e0669ed8c268bd6980d442fdb70
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/3497f0b566544e0669ed8c268bd6980d442fdb70
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1696
Bert Leunis deleted branch feature/CHANNELMGR-1696 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-11063] CMS-11063 Error in calendardate field in hippo
Marijan Milicevic pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms
Commits:
0390ed23 by Marijan Milicevic at 2018-02-06T12:37:06+01:00
CMS-11063 Error in calendardate field in hippo
- fix labels and tooltips (for date only field)
- - - - -
3 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html
@@ -34,9 +34,9 @@
-
+
-
+
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
@@ -24,6 +24,7 @@ import
org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.yui.calendar.DatePicker;
import org.apache.wicket.extensions.yui.calendar.DateTimeField;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -54,7 +55,10 @@ public class YuiDateTimeField extends DateTimeField {
public static final String DATE_LABEL = "date-label";
public static final String HOURS_LABEL = "hours-label";
public static final String MINUTES_LABEL = "minutes-label";
-
+public static final String CURRENT_DATE_TIME_TOOLTIP =
"set-to-current-date-tooltip";
+public static final String CURRENT_DATE_TIME_LABEL = "set-to-current-date";
+public static final String CURRENT_DATE_TOOLTIP =
"set-to-current-date-only-tooltip";
+public static final String CURRENT_DATE_LABEL = "set-to-current-date-only";
private final YuiDatePickerSettings settings;
private boolean todayLinkVisible = true;
private final boolean hideTime;
@@ -70,7 +74,7 @@ public class YuiDateTimeField extends DateTimeField {
public YuiDateTimeField(final String id, final IModel model, final
YuiDatePickerSettings settings, final boolean hideTime) {
super(id, model);
-
+this.hideTime = hideTime;
if (settings != null) {
this.settings = settings;
}
@@ -122,6 +126,12 @@ public class YuiDateTimeField extends DateTimeField {
});
today.add(HippoIcon.fromSprite("current-date-icon", Icon.RESTORE));
+// add tooltip:
+final Model dateTooltip = hideTime ?
Model.of(getString(CURRENT_DATE_TOOLTIP)) :
Model.of(getString(CURRENT_DATE_TIME_TOOLTIP));
+today.add(new AttributeModifier("title", dateTooltip));
+// add text:
+final Model dateLabel = hideTime ?
Model.of(getString(CURRENT_DATE_LABEL)):
Model.of(getString(CURRENT_DATE_TIME_LABEL));
+today.add(new Label("current-date-label", dateLabel));
//Add change behavior to super fields
for (final String name : new String[]{"date", "hours", "minutes",
"amOrPmChoice"}) {
@@ -147,7 +157,7 @@ public class YuiDateTimeField extends DateTimeField {
// hide the minutes field to prevent wicket.ajax javascript errors
get(MINUTES).setVisibilityAllowed(false);
}
-this.hideTime = hideTime;
+
}
private int calculateDateLength() {
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
@@ -1,6 +1,8 @@
picker-format=M/d/
set-to-current-date=Set to now
set-to-current-date-tooltip=Click to set current date and time
+set-to-current-date-only=Set to today
+set-to-current-date-only-tooltip=Click to set current date
date-label=Date
hours-label=Hours
minutes-label=Minutes
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/0390ed23dca58d8c6539e2dfaa2743ff202c53f9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/0390ed23dca58d8c6539e2dfaa2743ff202c53f9
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit] Pushed new tag jackrabbit-2.16.1
GitLab Mirror pushed new tag jackrabbit-2.16.1 at cms-community / hippo-jackrabbit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/tree/jackrabbit-2.16.1 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Pushed new branch bugfix/CMS-11063
Marijan Milicevic pushed new branch bugfix/CMS-11063 at cms-community / hippo-cms-translations --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/tree/bugfix/CMS-11063 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1708
Arthur Bogaart deleted branch bugfix/CHANNELMGR-1708 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch feature/HSTTWO-4208
Arthur Bogaart deleted branch feature/HSTTWO-4208 at cms-community / hippo-site-toolkit --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1708
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-1708 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1708 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-11063] CMS-11063 non-functional: (mostly) add @deprecated Javadoc
Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms
Commits:
827f5dad by Jeroen Hoffman at 2018-02-06T10:39:34+01:00
CMS-11063 non-functional: (mostly) add @deprecated Javadoc
- - - - -
6 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
@@ -27,6 +27,9 @@ import org.apache.wicket.model.IModel;
/**
* Label component to render a date (year-month-day) of the {@link Date}
object in GMT timezone.
+ *
+ * @deprecated no longer used because it uses a hardcoded GMT timezone, while
user session time zone is to be used.
+ * Use DateTimeLabel instead.
*/
@Deprecated
public class GMTDateLabel extends ZonedDateLabel {
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
@@ -30,6 +30,8 @@ import org.apache.wicket.model.IModel;
/**
* Label component that represents only the date (year-month-day) of the
* {@link ZonedDateTime} model object in current session locale format.
+ *
+ * @deprecated no longer used because it was only used by deprecated
GMTDateLabel.
*/
@Deprecated
public class ZonedDateLabel extends Label {
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-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.
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
@@ -49,7 +49,6 @@ import java.util.TimeZone;
*
* @see YuiDatePickerSettings for all configuration options
*/
-
public class YuiDateTimeField extends DateTimeField {
public static final String DATE_LABEL = "date-label";
@@ -65,18 +64,20 @@ public class YuiDateTimeField extends DateTimeField {
this(id, model, null);
}
-public YuiDateTimeField(final String id, final IModel model,
YuiDatePickerSettings settings) {
+public YuiDateTimeField(final String id, final IModel model, final
YuiDatePickerSettings settings) {
this(id, model, settings, false);
}
-public YuiDateTimeField(final String id, final IModel model,
YuiDatePickerSettings settings, final boolean hideTime) {
+public YuiDateTimeField(final String id, final IModel model, final
YuiDatePickerSettings settings, final boolean hideTime) {
super(id, model);
-this.hideTime = hideTime;
-if (settings == null) {
-settings = new YuiDatePickerSettings();
-settings.setLanguage(getLocale().getLanguage());
+
+if (settings != null) {
+this.settings = settings;
+}
+else {
+this.settings = new YuiDatePickerSettings();
+this.settings.setLanguage(getLocale().getLanguage());
}
-this.settings = settings;
setOutputMarkupId(true);
@@ -139,13 +140,14 @@ public class YuiDateTimeField extends DateTimeField {
}
});
}
+
if (hideTime) {
// hiding the "hours" component hides the entire "hours"
wicket:enclosure
get(HOURS).setVisibilityAllowed(false);
// hide the minutes field to prevent wicket.ajax javascript errors
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1520] CHANNELMGR-1520 Use 'canCreateAllRequiredFields' property in frontend
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community
/ hippo-addon-channel-manager
Commits:
5fb74cc6 by Mathijs den Burger at 2018-02-05T16:44:32+01:00
CHANNELMGR-1520 Use canCreateAllRequiredFields property in frontend
Instead of allRequiredFieldsIncluded.
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
@@ -41,7 +41,7 @@ class ContentEditorCtrl {
}
isSaveAllowed() {
-return this.isEditing() && this._isDocumentDirty() && this.form.$valid &&
this.ContentEditor.getDocumentType().allRequiredFieldsIncluded;
+return this.isEditing() && this._isDocumentDirty() && this.form.$valid &&
this.ContentEditor.getDocumentType().canCreateAllRequiredFields;
}
_isDocumentDirty() {
@@ -53,7 +53,7 @@ class ContentEditorCtrl {
}
alternativeStep2() {
-return this.ContentEditor.isEditing() &&
!this.ContentEditor.getDocumentType().allRequiredFieldsIncluded;
+return this.ContentEditor.isEditing() &&
!this.ContentEditor.getDocumentType().canCreateAllRequiredFields;
}
getFieldTypes() {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.spec.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.spec.js
@@ -77,12 +77,12 @@ describe('ContentEditorCtrl', () => {
[true, false].forEach((editing) => {
[true, false].forEach((dirty) => {
[true, false].forEach((valid) => {
- [true, false].forEach((allRequiredFieldsIncluded) => {
+ [true, false].forEach((canCreateAllRequiredFields) => {
ContentEditor.isEditing.and.returnValue(editing);
ContentEditor.isDocumentDirty.and.returnValue(dirty);
form.$valid = valid;
-ContentEditor.getDocumentType.and.returnValue({
allRequiredFieldsIncluded });
-expect($ctrl.isSaveAllowed()).toBe(editing && dirty && valid &&
allRequiredFieldsIncluded);
+ContentEditor.getDocumentType.and.returnValue({
canCreateAllRequiredFields });
+expect($ctrl.isSaveAllowed()).toBe(editing && dirty && valid &&
canCreateAllRequiredFields);
});
});
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5fb74cc684a3f201c9a2c4268bd93c1daaf1937d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5fb74cc684a3f201c9a2c4268bd93c1daaf1937d
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
