[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1586 Enable lint in frontend-ng
Arthur Bogaart pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
6d87c29a by Arthur Bogaart at 2017-11-15T01:00:13+01:00
CHANNELMGR-1586 Enable lint in frontend-ng
Fixed two lint errors.
- - - - -
3 changed files:
- frontend-ng/pom.xml
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
- frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.scss
Changes:
=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -54,7 +54,7 @@
exec
npm
- run build
+ run build -- --lint
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
@@ -80,7 +80,7 @@ export class CreateContentStep2Component implements OnInit {
this.onLoadSuccess(doc, docType);
this.loading = false;
}).catch(() => {
-this.loading = false
+this.loading = false;
});
}
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.scss
=
--- a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.scss
+++ b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.scss
@@ -15,12 +15,12 @@
@import 'variables';
right-side-panel {
- transition: max-width $swift-ease-out;
max-width: 0;
+ transition: max-width $swift-ease-out;
&.sidepanel-open {
-transition: max-width $swift-ease-in;
max-width: 50% !important;
+transition: max-width $swift-ease-in;
md-sidenav {
margin-left: auto;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6d87c29a55edc25da5ba53741eac677131eee2d9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6d87c29a55edc25da5ba53741eac677131eee2d9
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][feature/create-content] CHANNELMGR-1488 Match unit tests to information in thrown errors
Michael Metternich pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
a5203ffe by Michael Metternich at 2017-11-14T21:39:00+01:00
CHANNELMGR-1488 Match unit tests to information in thrown errors
- - - - -
1 changed file:
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
Changes:
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
@@ -70,6 +70,7 @@ import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -84,7 +85,7 @@ public class DocumentsServiceImplTest {
private Session session;
private Locale locale;
-private final DocumentsServiceImpl documentsService =
(DocumentsServiceImpl) DocumentsService.get();
+private final DocumentsService documentsService = (DocumentsServiceImpl)
DocumentsService.get();
private NewDocumentInfo info;
@Before
@@ -287,7 +288,7 @@ public class DocumentsServiceImplTest {
documentsService.createDraft(uuid, session, locale);
fail("No Exception");
} catch (final InternalServerErrorException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Failed to retrieve JCR session for
node /bla"));
}
verifyAll();
@@ -317,7 +318,7 @@ public class DocumentsServiceImplTest {
documentsService.createDraft(uuid, session, locale);
fail("No Exception");
} catch (final InternalServerErrorException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Failed to retrieve type of document
/bla"));
}
verifyAll();
@@ -440,7 +441,7 @@ public class DocumentsServiceImplTest {
expect(WorkflowUtils.getDocumentVariantNode(eq(handle),
eq(Variant.UNPUBLISHED))).andReturn(Optional.of(unpublished));
expect(docType.getFields()).andReturn(fields);
FieldTypeUtils.readFieldValues(eq(unpublished), eq(fields),
isA(Map.class));
-expectLastCall().andAnswer(() ->
((Map)getCurrentArguments()[2]).put("extraField", new FieldValue("value")));
+expectLastCall().andAnswer(() -> ((Map)
getCurrentArguments()[2]).put("extraField", new FieldValue("value")));
replayAll(docType);
@@ -628,7 +629,7 @@ public class DocumentsServiceImplTest {
documentsService.updateDraft(uuid, document, session, locale);
fail("No Exception");
} catch (final ForbiddenException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Document type EasyMock for class
org.onehippo.cms.channelmanager.content.documenttype.model.DocumentType can not
be updated."));
}
verifyAll();
@@ -693,7 +694,7 @@ public class DocumentsServiceImplTest {
documentsService.updateDraft(uuid, document, session, locale);
fail("No Exception");
} catch (final InternalServerErrorException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Failed to save changes to draft
node of document uuid"));
}
verifyAll();
@@ -1029,7 +1030,7 @@ public class DocumentsServiceImplTest {
documentsService.updateDraftField(uuid, fieldPath, fieldValues,
session, locale);
fail("No Exception");
} catch (final ForbiddenException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Document type EasyMock for class
org.onehippo.cms.channelmanager.content.documenttype.model.DocumentType can not
be updated."));
}
verifyAll();
@@ -1151,7 +1152,7 @@ public class DocumentsServiceImplTest {
documentsService.updateDraftField(uuid, fieldPath, fieldValues,
session, locale);
fail("No Exception");
} catch (final InternalServerErrorException e) {
-assertNull(e.getPayload());
+assertThat(e.getPayload(), is("Failed to save changes to field
ns:field in draft node of document uuid"));
}
verifyAll();
@@ -1243,7 +1244,7 @@ public class DocumentsServiceImplTest {
documentsService.deleteDraft(uuid, session, locale);
fail("No Exception");
} catch (final InternalServerErrorException e) {
-
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1565 Add and modify QA classes for step 1 and step 2 of create content
Ariel Weinberger pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
348446d6 by Ariel Weinberger at 2017-11-14T16:46:43+01:00
CHANNELMGR-1565 Add and modify QA classes for step 1 and step 2 of create
content
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/document-location/document-location-field.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.html
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/document-location/document-location-field.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/document-location/document-location-field.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/document-location/document-location-field.html
@@ -17,7 +17,7 @@
-
+
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html
@@ -17,7 +17,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
@@ -36,7 +36,8 @@
mat-icon-button
matSuffix
type="button"
- (click)="setManualUrlEditMode(true)">
+ (click)="setManualUrlEditMode(true)"
+ class="qa-edit-url">
mode_edit
@@ -45,7 +46,8 @@
mat-icon-button
matSuffix
type="button"
- (click)="setManualUrlEditMode(false)">
+ (click)="setManualUrlEditMode(false)"
+ class="qa-generate-url">
autorenew
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html
@@ -55,7 +55,7 @@
{{
documentType.displayName }}
@@ -75,12 +75,12 @@
-
{{ 'CANCEL' | translate }}
-
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.html
@@ -52,7 +52,7 @@
@@ -86,7 +86,7 @@
{{ 'DISCARD' | translate }}
-
{{ 'SAVE' | translate }}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/348446d6986501026442c67314a17af18aa44e03
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/348446d6986501026442c67314a17af18aa44e03
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-repository][feature/REPO-1872] REPO-1872 Auto-test for filtering UUIDs and excluding paths from auto-exported content
Peter Centgraf pushed to branch feature/REPO-1872 at cms-community /
hippo-repository
Commits:
109be1c4 by Peter Centgraf at 2017-11-14T16:19:27+01:00
REPO-1872 Auto-test for filtering UUIDs and excluding paths from auto-exported
content
- - - - -
11 changed files:
-
engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-config/test.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/content.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-content/uuids/child.yaml
- +
engine/src/test/resources/AutoExportIntegrationTest/content_filters/out/hcm-module.yaml
Changes:
=
engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java
=
---
a/engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java
+++
b/engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java
@@ -61,6 +61,18 @@ public class AutoExportIntegrationTest {
*/
@Test
+public void content_filters() throws Exception {
+// test that autoexport:filteruuids and autoexport:excluded are
applied to content
+new Fixture("content_filters").test(session -> {
+session.getNode("/content/uuids").setProperty("newProperty",
"value");
+session.getNode("/content/uuids/child").setProperty("newProperty",
"value");
+session.getNode("/content")
+.addNode("excluded", "nt:unstructured")
+.addNode("child", "nt:unstructured");
+});
+}
+
+@Test
public void config_sns_create_new() throws Exception {
new Fixture("config_sns_create_new").test(session -> {
final Node container =
session.getNode("/config").addNode("container", "nt:unstructured");
=
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml
=
--- /dev/null
+++
b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-config/test.yaml
@@ -0,0 +1,14 @@
+definitions:
+ config:
+/content:
+ .meta:category: content
+/hippo:configuration/hippo:modules/autoexport:
+ /hippo:moduleconfig:
+autoexport:filteruuidpaths:
+ operation: add
+ type: string
+ value: ['/content/uuids']
+autoexport:excluded:
+ operation: add
+ type: string
+ value: ['/content/excluded','/content/excluded/**']
=
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml
=
--- /dev/null
+++
b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/content.yaml
@@ -0,0 +1,2 @@
+/content:
+ jcr:primaryType: nt:unstructured
\ No newline at end of file
=
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml
=
--- /dev/null
+++
b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids.yaml
@@ -0,0 +1,3 @@
+/content/uuids:
+ jcr:primaryType: nt:unstructured
+ jcr:mixinTypes: ['mix:referenceable']
\ No newline at end of file
=
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml
=
--- /dev/null
+++
b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-content/uuids/child.yaml
@@ -0,0 +1,3 @@
+/content/uuids/child:
+ jcr:primaryType: nt:unstructured
+ jcr:mixinTypes: ['mix:referenceable']
=
engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml
=
--- /dev/null
+++
b/engine/src/test/resources/AutoExportIntegrationTest/content_filters/in/hcm-module.yaml
@@ -0,0 +1,7 @@
+group:
+ name: hippo-cms-test
+ after: [hippo-cms, test-group]
+project:
+ name: autoexport-integration-test-project
+ after: hippo-repository
+module:
[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/REPO-1881
Ard Schrijvers deleted branch feature/REPO-1881 at cms-community / hippo-repository --- 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-repository][release/4.2] 7 commits: REPO-1881 prepare for backport: bump services version (not to be backported itself)
Ard Schrijvers pushed to branch release/4.2 at cms-community / hippo-repository Commits: 86c75b23 by Ate Douma at 2017-11-03T00:17:42+01:00 REPO-1881 prepare for backport: bump services version (not to be backported itself) - - - - - b05161a4 by Ate Douma at 2017-11-03T01:03:13+01:00 REPO-1881 [Backport 11.2] Implement new LockManager service and replace all deprecated HippoLock and HippoLockManager usages This is a cherry-picked and squashed backport from REPO-1811, REPO-1873, REPO-1874 and REPO-1875: REPO-1811 Implement in-memory lock manager (cherry picked from commit dfa6f279653256cbeaabe6ceb59d4171b64c508f) REPO-1811 To the RepositoryImpl add a Journal ConnectionHelper accessor Via this Journal ConnectionHelper we can access the Journal DataSource via the ConnectionHelperDataSourceAccessor. Admittedly, a bit clumsy but we need access to the Journal DataSource because we need to know whether we are dealing with a database *and* whether we have a clustered setup : Only in that case, the lock mechanism has to be upgraded from in memory locking to db base locking because needs to be cluster wide (cherry picked from commit 4750450f8d1dc505d404fb32ce1eac002df9b707) REPO-1811 Support for a Database lock manager The Database lock manager interaction is pretty much exactly the same as the MemoryLockManager interaction. The biggest difference is that the DbLockManager creates database based locks and the MemoryLockManager creates MemoryLocks. Note that a DbLock is the same as the MemoryLock but only contains a #destroy implementation that releases the database lock. The DbLockManager is still work in progress (cherry picked from commit e0f19fab9cdecc4fc6cb15bc79d55ffa30fff8fb) REPO-1811 Fix the LockClusterTest setup (still ignored but the setup failed since we do not allow SNS below jcr:root any more) (cherry picked from commit 1dba0d49778da55568fcafee6ddff4fdc6563190) REPO-1811 Support database locking (cherry picked from commit 92c914efffe6eaacb79bc638f71576e1463b9aa0) REPO-1811 Support background jobs in the Memory or Db LockManager - All the background jobs are run by a single thread - By default they run every 5 seconds with an initial delay of 5 seconds - Every background job is wrapped in a synchronized runnable the synchronized on the LockManager instance: The reason for this is that we do not want background jobs to write concurrently to possibly the same records as other (background) jobs - We have the following background jobs: 1) UnlockStoppedThreadJanitor : releases database locks for records that were held by a thread that is not alive any more 2) DbResetExpiredLocksJanitor : Resets all database rows which have expired locks (rows with status RUNNING or ABORT and expirationTime has passed 3) DbLockRefresher: Refreshes the expiresTime of a lock to currentTime + refreshRateSeconds 4) LockThreadInterrupter : Interrupts the Thread that holds the lock that has been marked ABORT (cherry picked from commit cbf14aedcc6518e81c94104d705765b492a92188) REPO-1811 Make sure getLocks and isLocked works cluster wide in case of a database (cherry picked from commit 441beff40149a15603e58e4670f33b64b1274eeb) REPO-1811 Fix sql statement (cherry picked from commit d3d25849c9ea0525df7eaf9e2e18e3de1f27a11d) REPO-1811 Extract abstract test and add an abort test (cherry picked from commit 5ab1e55f7114e1cb24d671f076f7a7ed697f5c69) REPO-1811 use getHoldCount() instead of protected access (cherry picked from commit 7027fce32f09b750e7e9a8639ba4a8ca32fa2e3d) REPO-1811 improve feedback (cherry picked from commit 0bf87cb5a2897a598bdbaca9219fcc37067465d6) REPO-1811 use getHoldCount() instead of protected access (cherry picked from commit a268b5e6a7c4dab939e489a91d2afe88b82d69f9) REPO-1811 Fix abort statement (cherry picked from commit dac8d9cce79f4dcbaa564219cf725d6d108f45d8) REPO-1811 Encapsulate the localLocks object Since localLocks is a hashmap, all access to it should be synchronized. This can be easier achieved by encapsulating it and whenever needed by other classes, return a new object containing the same locks (cherry picked from commit cc3e10d9c50e4e0d1ecc0fbd0428c4915bcf0713) REPO-1811 Enhance abort tests (cherry picked from commit 43f170296b8c9027ca0b9f9a8f2464f3e9aa363c) REPO-1811 use auto closable in integration tests (cherry picked from commit 05143eddc4817c9fdb872cbd9c3be34a4543743d) REPO-1811 Correct the expiresTime parameter (cherry picked from commit 62bd68c27eebfcf6ade8ff0e8609aed3dfd86458) REPO-1811 Locks in status ABORT should also be refreshed Namely if a lock is in status ABORT and the lock is for the *CLUSTER NODE* on which the DbLockRefresher runs, then it means that on this
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1488 Improve warning messages
Michael Metternich pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
64afdae2 by Michael Metternich at 2017-11-14T15:25:25+01:00
CHANNELMGR-1488 Improve warning messages
- - - - -
1 changed file:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
@@ -62,6 +62,8 @@ import
org.onehippo.repository.documentworkflow.DocumentWorkflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.hippoecm.repository.util.JcrUtils.getNodePathQuietly;
+
class DocumentsServiceImpl implements DocumentsService {
private static final Logger log =
LoggerFactory.getLogger(DocumentsServiceImpl.class);
private static final String WORKFLOW_CATEGORY_DEFAULT = "default";
@@ -126,7 +128,7 @@ class DocumentsServiceImpl implements DocumentsService {
final DocumentType docType = getDocumentType(handle, locale);
if (docType.isReadOnlyDueToUnknownValidator()) {
-throw new ForbiddenException();
+throw new ForbiddenException("Document type " + docType + " can
not be updated.");
}
// Push fields onto draft node
@@ -136,8 +138,9 @@ class DocumentsServiceImpl implements DocumentsService {
try {
session.save();
} catch (final RepositoryException e) {
-log.warn("Failed to save changes to draft node of document {}",
uuid, e);
-throw new InternalServerErrorException();
+final String warning = "Failed to save changes to draft node of
document " + uuid;
+log.warn(warning, e);
+throw new InternalServerErrorException(warning);
}
if (!FieldTypeUtils.validateFieldValues(document.getFields(),
docType.getFields())) {
@@ -167,7 +170,7 @@ class DocumentsServiceImpl implements DocumentsService {
final DocumentType docType = getDocumentType(handle, locale);
if (docType.isReadOnlyDueToUnknownValidator()) {
-throw new ForbiddenException();
+throw new ForbiddenException("Document type " + docType + " can
not be updated.");
}
// Write field value to draft node
@@ -176,8 +179,9 @@ class DocumentsServiceImpl implements DocumentsService {
try {
session.save();
} catch (final RepositoryException e) {
-log.warn("Failed to save changes to field '{}' in draft node
of document {}", fieldPath, uuid, e);
-throw new InternalServerErrorException();
+final String warning = "Failed to save changes to field " +
fieldPath + " in draft node of document " + uuid;
+log.warn(warning, e);
+throw new InternalServerErrorException(warning);
}
}
}
@@ -195,8 +199,9 @@ class DocumentsServiceImpl implements DocumentsService {
try {
workflow.disposeEditableInstance();
} catch (WorkflowException | RepositoryException | RemoteException e) {
-log.warn("Failed to dispose of editable instance", e);
-throw new InternalServerErrorException();
+final String warning = "Failed to dispose of editable instance";
+log.warn(warning, e);
+throw new InternalServerErrorException(warning);
}
}
@@ -249,9 +254,9 @@ class DocumentsServiceImpl implements DocumentsService {
return getDraft(handle, documentTypeId, locale);
} catch (WorkflowException | RepositoryException | RemoteException e) {
-log.warn("Failed to add document '{}' of type '{}' to folder '{}'
using template query '{}'",
-slug, documentTypeId, newDocumentInfo.getRootPath(),
templateQuery);
-throw new InternalServerErrorException();
+final String warning = "Failed to add document " + slug + " of
type " + documentTypeId + " to folder " + newDocumentInfo.getRootPath() + "
using template query " + templateQuery;
+log.warn(warning, e);
+throw new InternalServerErrorException(warning);
}
}
@@ -269,8 +274,9 @@ class DocumentsServiceImpl implements DocumentsService {
// Archiving not possible: the document can be published, a request
can be pending etc. Only case left to check:
// is the document a draft that was just created? (in which case it
won't have a 'preview' variant yet)
if (EditingUtils.hasPreview(documentWorkflow)) {
-log.warn("Forbade
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1563] 3 commits: CHANNELMGR-1510 Fix a bug where right side panel could not be opened after closing step2
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1563 at cms-community /
hippo-addon-channel-manager
Commits:
e3bd21cc by Ran ShemTov at 2017-11-14T13:53:59+01:00
CHANNELMGR-1510 Fix a bug where right side panel could not be opened after
closing step2
- - - - -
7bf27db7 by Ran ShemTov at 2017-11-14T14:02:11+01:00
Merge branch feature/CC-CHANNELMGR-1510 into feature/create-content
- - - - -
7a42f1bf by Arthur Bogaart at 2017-11-14T14:16:03+01:00
CHANNELMGR-1563 Merge feature/create-content changes
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
@@ -190,12 +190,17 @@ describe('Create content step 2 component', () => {
});
it('discards the document when "discard" is selected', () => {
+ component.onBeforeStateChange.emit = arg => arg();
+ spyOn(component.onBeforeStateChange, 'emit').and.callThrough();
+ spyOn(Promise, 'resolve').and.callThrough();
component.close().then(() => {
expect(component.documentId).not.toBeDefined();
expect(component.doc).not.toBeDefined();
expect(component.docType).not.toBeDefined();
expect(component.feedback).not.toBeDefined();
expect(component.title).toEqual('Create new content');
+expect(component.onBeforeStateChange.emit).toHaveBeenCalled();
+expect(Promise.resolve).toHaveBeenCalled();
expect(component.onClose.emit).toHaveBeenCalled();
});
});
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
@@ -165,6 +165,7 @@ export class CreateContentStep2Component implements OnInit {
delete this.docType;
delete this.feedback;
this.title = this.defaultTitle;
+this.onBeforeStateChange.emit(() => Promise.resolve());
}
private resetBeforeStateChange() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/89b659b1e1006b3c9b6e169dc5a912b3168ee6d6...7a42f1bfbf5c54fa2c8fd01b475d8c4afa3bf066
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/89b659b1e1006b3c9b6e169dc5a912b3168ee6d6...7a42f1bfbf5c54fa2c8fd01b475d8c4afa3bf066
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][feature/CC-CHANNELMGR-1563] 39 commits: CHANNELMGR-1510 Initialise create content step 2 component
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1563 at cms-community / hippo-addon-channel-manager Commits: bc059ded by Ran ShemTov at 2017-10-25T16:16:20+02:00 CHANNELMGR-1510 Initialise create content step 2 component - - - - - dbbe32f0 by Ran ShemTov at 2017-10-27T11:04:49+02:00 CHANNELMGR-1510 Rename folder according to recent convention - - - - - 99372fd6 by Ran ShemTov at 2017-10-27T12:26:04+02:00 CHANNELMGR-1510 Use name-url-fields component from feature/CC-CHANNELMGR-1484 Create dialog in Create content step 2 which features the name url fields - - - - - f402c844 by Ran ShemTov at 2017-10-27T14:50:38+02:00 CHANNELMGR-1510 Create binding between the name and url fields component to CC2 - - - - - 71bbeec8 by Ran ShemTov at 2017-10-31T10:29:00+01:00 CHANNELMGR-1510 Finalize the change document name dialog - - - - - fd68f920 by Ran ShemTov at 2017-11-01T10:00:51+01:00 CHANNELMGR-1510 Change from CC2 to edit content after save - - - - - 777c6a65 by Ran ShemTov at 2017-11-01T11:01:54+01:00 CHANNELMGR-1510 Fake back-end call and retrieve newly created draft document - - - - - e539f08b by Ran ShemTov at 2017-11-01T12:58:12+01:00 CHANNELMGR-1510 Refactor switching between create content 1 and 2 - - - - - ca7d9e75 by Ran ShemTov at 2017-11-01T13:05:58+01:00 CHANNELMGr-1510 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/package.json # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.service.ts # frontend-ng/src/i18n/en.json - - - - - 2f0735c0 by Ran ShemTov at 2017-11-01T16:50:42+01:00 CHANNELMGR-1510 Add unit tests for create content step 2 - - - - - 4b62b589 by Ran ShemTov at 2017-11-02T11:55:47+01:00 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts - - - - - bbab65b3 by Ran ShemTov at 2017-11-02T13:57:49+01:00 CHANNELMGR-1510 Implement back-end call to create new draft and show it on step 2 - - - - - 710efd54 by Ran ShemTov at 2017-11-03T12:31:02+01:00 CHANNELMGR-1510 Convert create content step2 to Angular 4 - - - - - 83d4d974 by Ran ShemTov at 2017-11-03T16:47:48+01:00 CHANNELMGR-1510 Convert Step2 and its dependencies to Angular4 - Add angular4 translation service - Add angular 4 names svg icons and configure app module to use them - Use translations where it was missing - Fix an issue with full width not working on create-content - - - - - 40d1e36d by Ran ShemTov at 2017-11-06T16:04:22+01:00 CHANNELMGR-1510 Refactor step2 component after review - Add qa classes - Fix event emitters using $event - Use kebab case naming conventions - Add host listener from step 1 and 2 to listen to esc key - Add missing license comments - - - - - 0806d56e by Mathijs den Burger at 2017-11-06T16:17:45+01:00 CHANNELMGR-1511 Implement REST call to delete a document Returns 204 (No Content) when the call succeeds. Returned errors: - 403 (Not Allowed) when the user is not allowed to delete the document. Happens when the document has a published variant, when someone else is editing it, when a publication request is pending etc. - 404 (Not Found) when no document with the given UUID exists. Also happens for UUIDs that do exist but are not a document handle. - 500 (Internal Server Error) when the workflow call delete() fails. - - - - - 57851d07 by Ran ShemTov at 2017-11-06T16:31:52+01:00 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.service.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.spec.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html - - - - - 7c873b1d by Ran ShemTov at 2017-11-06T16:56:44+01:00 CHANNELMGR-1510 Fix failing tests requiring translation mock - - - - - d45b76fc by Ran ShemTov at 2017-11-07T09:53:38+01:00 CHANNELMGR-1510 Disable unit tests for step-2 component - - - - - a6865968 by Ran ShemTov at 2017-11-07T17:20:31+01:00 CHANNELMGR-1510 Fix linting issues and svg icons testing errors - - - - - 2b50b9a5 by Mathijs den Burger at 2017-11-08T09:21:32+01:00 CHANNELMGR-1511 Merge branch feature/create-content - - - - - fcea143e by Mathijs den Burger at 2017-11-08T17:28:00+01:00 CHANNELMGR-1511 Also delete newly created
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CC-CHANNELMGR-1581
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1581 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] Deleted branch feature/CC-CHANNELMGR-1510
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1510 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][feature/create-content] 2 commits: CHANNELMGR-1510 Fix a bug where right side panel could not be opened after closing step2
Ran Shem Tov pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
e3bd21cc by Ran ShemTov at 2017-11-14T13:53:59+01:00
CHANNELMGR-1510 Fix a bug where right side panel could not be opened after
closing step2
- - - - -
7bf27db7 by Ran ShemTov at 2017-11-14T14:02:11+01:00
Merge branch feature/CC-CHANNELMGR-1510 into feature/create-content
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
@@ -190,12 +190,17 @@ describe('Create content step 2 component', () => {
});
it('discards the document when "discard" is selected', () => {
+ component.onBeforeStateChange.emit = arg => arg();
+ spyOn(component.onBeforeStateChange, 'emit').and.callThrough();
+ spyOn(Promise, 'resolve').and.callThrough();
component.close().then(() => {
expect(component.documentId).not.toBeDefined();
expect(component.doc).not.toBeDefined();
expect(component.docType).not.toBeDefined();
expect(component.feedback).not.toBeDefined();
expect(component.title).toEqual('Create new content');
+expect(component.onBeforeStateChange.emit).toHaveBeenCalled();
+expect(Promise.resolve).toHaveBeenCalled();
expect(component.onClose.emit).toHaveBeenCalled();
});
});
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
@@ -165,6 +165,7 @@ export class CreateContentStep2Component implements OnInit {
delete this.docType;
delete this.feedback;
this.title = this.defaultTitle;
+this.onBeforeStateChange.emit(() => Promise.resolve());
}
private resetBeforeStateChange() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e9c9e8586c4111e3163baac4e978ddc305c920a0...7bf27db73b10b473cef642f3d5d87b44cd9cbeab
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e9c9e8586c4111e3163baac4e978ddc305c920a0...7bf27db73b10b473cef642f3d5d87b44cd9cbeab
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-services-api] Deleted branch feature/CMS-10974
Ard Schrijvers deleted branch feature/CMS-10974 at cms-community / hippo-services-api --- 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 feature/CC-CHANNELMGR-1510
Ran Shem Tov pushed new branch feature/CC-CHANNELMGR-1510 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1510 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-repository] Pushed new branch feature/REPO-1872
Peter Centgraf pushed new branch feature/REPO-1872 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1872 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 feature/CC-CHANNELMGR-1581
Ran Shem Tov pushed new branch feature/CC-CHANNELMGR-1581 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1581 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][feature/CC-CHANNELMGR-1513] CHANNELMGR-1568 Prevent NPE when encoding or setting names
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1513 at cms-community
/ hippo-addon-channel-manager
Commits:
e3567ac8 by Mathijs den Burger at 2017-11-14T11:40:15+01:00
CHANNELMGR-1568 Prevent NPE when encoding or setting names
The UriEncoder throws a NPE when encoding null. Prevent that by always
returning null when encoding a null value.
When reading the old URL name fails (because JcrUtils#getNodeNameQuietly
returns null), comparing the old and new URL name would throw an NPE.
Prevent that by using StringUtils#equals.
- - - - -
2 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtils.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtilsTest.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtils.java
@@ -50,6 +50,9 @@ public class DocumentNameUtils {
}
private static String encode(final String name, final Encoding encoding,
final String locale) {
+if (name == null) {
+return null;
+}
final StringCodecService service =
HippoServiceRegistry.getService(StringCodecService.class);
final StringCodec codec = service.getStringCodec(encoding, locale);
return codec.encode(name);
@@ -62,8 +65,8 @@ public class DocumentNameUtils {
final String newUrlName = encodeUrlName(urlName, locale);
final String newDisplayName = encodeDisplayName(displayName, locale);
-final boolean sameUrlName = oldUrlName.equals(newUrlName);
-final boolean sameDisplayName = oldDisplayName.equals(newDisplayName);
+final boolean sameUrlName = StringUtils.equals(oldUrlName, newUrlName);
+final boolean sameDisplayName = StringUtils.equals(oldDisplayName,
newDisplayName);
if (sameUrlName && sameDisplayName) {
// nothing to update
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtilsTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtilsTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/DocumentNameUtilsTest.java
@@ -25,6 +25,7 @@ import org.hippoecm.repository.api.StringCodecService;
import org.hippoecm.repository.api.StringCodecService.Encoding;
import org.hippoecm.repository.api.WorkflowException;
import org.hippoecm.repository.standardworkflow.DefaultWorkflow;
+import org.hippoecm.repository.util.JcrUtils;
import org.hippoecm.repository.util.WorkflowUtils;
import org.junit.Before;
import org.junit.Test;
@@ -39,15 +40,17 @@ import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertNull;
import static org.powermock.api.easymock.PowerMock.createMock;
import static org.powermock.api.easymock.PowerMock.expectLastCall;
import static org.powermock.api.easymock.PowerMock.mockStatic;
+import static org.powermock.api.easymock.PowerMock.mockStaticPartial;
import static org.powermock.api.easymock.PowerMock.replayAll;
import static org.powermock.api.easymock.PowerMock.verifyAll;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("javax.management.*")
-@PrepareForTest({HippoServiceRegistry.class, WorkflowUtils.class})
+@PrepareForTest({HippoServiceRegistry.class, JcrUtils.class,
WorkflowUtils.class})
public class DocumentNameUtilsTest {
@Before
@@ -94,6 +97,12 @@ public class DocumentNameUtilsTest {
}
@Test
+public void encodeUrlNameNull() {
+final String encoded = DocumentNameUtils.encodeUrlName(null, null);
+assertNull(encoded);
+}
+
+@Test
public void encodeDisplayNameWithLocale() {
final StringCodecService service =
createMock(StringCodecService.class);
final StringCodec codec = createMock(StringCodec.class);
@@ -226,6 +235,38 @@ public class DocumentNameUtilsTest {
}
@Test
+public void setNamesBothAndUrlNameReadIsNull() throws Exception {
+final Node node = createHandle("old-name", "Old Name (encoded)");
+final StringCodecService service =
createMock(StringCodecService.class);
+final StringCodec displayNameCodec = createMock(StringCodec.class);
+final StringCodec urlNameCodec = createMock(StringCodec.class);
+final DefaultWorkflow workflow =
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][master] HIPPLUG-1481 add Apache license headers where missing
Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-poll Commits: db55925c by Jeroen Hoffman at 2017-11-14T09:58:25+01:00 HIPPLUG-1481 add Apache license headers where missing - - - - - 7 changed files: - essentials-demo-feature/pom.xml - essentials-demo-feature/src/main/resources/META-INF/instructions.xml - essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html - essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml - essentials-demo-feature/src/main/resources/xml/menu-item.xml - essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml - pom.xml Changes: = essentials-demo-feature/pom.xml = --- a/essentials-demo-feature/pom.xml +++ b/essentials-demo-feature/pom.xml @@ -1,4 +1,19 @@ + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 = essentials-demo-feature/src/main/resources/META-INF/instructions.xml = --- a/essentials-demo-feature/src/main/resources/META-INF/instructions.xml +++ b/essentials-demo-feature/src/main/resources/META-INF/instructions.xml @@ -1,5 +1,19 @@ + http://www.onehippo.org/essentials/instructions;> = essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html = --- a/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html +++ b/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html @@ -1,3 +1,18 @@ + = essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml = --- a/essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml +++ b/essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml @@ -1,4 +1,19 @@ + http://java.sun.com/xml/ns/javaee; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd;> = essentials-demo-feature/src/main/resources/xml/menu-item.xml = --- a/essentials-demo-feature/src/main/resources/xml/menu-item.xml +++ b/essentials-demo-feature/src/main/resources/xml/menu-item.xml @@ -1,4 +1,19 @@ + http://www.jcp.org/jcr/sv/1.0;> hst:sitemenuitem = essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml = --- a/essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml +++ b/essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml @@ -1,4 +1,19 @@ + http://www.jcp.org/jcr/sv/1.0;> hipposysedit:templatetype = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CC-CHANNELMGR-1510
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1510 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][feature/CC-CHANNELMGR-1513] 27 commits: CHANNELMGR-1510 Initialise create content step 2 component
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1513 at cms-community / hippo-addon-channel-manager Commits: bc059ded by Ran ShemTov at 2017-10-25T16:16:20+02:00 CHANNELMGR-1510 Initialise create content step 2 component - - - - - dbbe32f0 by Ran ShemTov at 2017-10-27T11:04:49+02:00 CHANNELMGR-1510 Rename folder according to recent convention - - - - - 99372fd6 by Ran ShemTov at 2017-10-27T12:26:04+02:00 CHANNELMGR-1510 Use name-url-fields component from feature/CC-CHANNELMGR-1484 Create dialog in Create content step 2 which features the name url fields - - - - - f402c844 by Ran ShemTov at 2017-10-27T14:50:38+02:00 CHANNELMGR-1510 Create binding between the name and url fields component to CC2 - - - - - 71bbeec8 by Ran ShemTov at 2017-10-31T10:29:00+01:00 CHANNELMGR-1510 Finalize the change document name dialog - - - - - fd68f920 by Ran ShemTov at 2017-11-01T10:00:51+01:00 CHANNELMGR-1510 Change from CC2 to edit content after save - - - - - 777c6a65 by Ran ShemTov at 2017-11-01T11:01:54+01:00 CHANNELMGR-1510 Fake back-end call and retrieve newly created draft document - - - - - e539f08b by Ran ShemTov at 2017-11-01T12:58:12+01:00 CHANNELMGR-1510 Refactor switching between create content 1 and 2 - - - - - ca7d9e75 by Ran ShemTov at 2017-11-01T13:05:58+01:00 CHANNELMGr-1510 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/package.json # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.service.ts # frontend-ng/src/i18n/en.json - - - - - 2f0735c0 by Ran ShemTov at 2017-11-01T16:50:42+01:00 CHANNELMGR-1510 Add unit tests for create content step 2 - - - - - 4b62b589 by Ran ShemTov at 2017-11-02T11:55:47+01:00 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts - - - - - bbab65b3 by Ran ShemTov at 2017-11-02T13:57:49+01:00 CHANNELMGR-1510 Implement back-end call to create new draft and show it on step 2 - - - - - 710efd54 by Ran ShemTov at 2017-11-03T12:31:02+01:00 CHANNELMGR-1510 Convert create content step2 to Angular 4 - - - - - 83d4d974 by Ran ShemTov at 2017-11-03T16:47:48+01:00 CHANNELMGR-1510 Convert Step2 and its dependencies to Angular4 - Add angular4 translation service - Add angular 4 names svg icons and configure app module to use them - Use translations where it was missing - Fix an issue with full width not working on create-content - - - - - 40d1e36d by Ran ShemTov at 2017-11-06T16:04:22+01:00 CHANNELMGR-1510 Refactor step2 component after review - Add qa classes - Fix event emitters using $event - Use kebab case naming conventions - Add host listener from step 1 and 2 to listen to esc key - Add missing license comments - - - - - 57851d07 by Ran ShemTov at 2017-11-06T16:31:52+01:00 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.service.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.spec.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.html # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.component.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html - - - - - 7c873b1d by Ran ShemTov at 2017-11-06T16:56:44+01:00 CHANNELMGR-1510 Fix failing tests requiring translation mock - - - - - d45b76fc by Ran ShemTov at 2017-11-07T09:53:38+01:00 CHANNELMGR-1510 Disable unit tests for step-2 component - - - - - a6865968 by Ran ShemTov at 2017-11-07T17:20:31+01:00 CHANNELMGR-1510 Fix linting issues and svg icons testing errors - - - - - 23a2500d by Arthur Bogaart at 2017-11-10T13:58:54+01:00 CHANNELMGR-1481 Add changeLocale @Output and connect it to Step1 - - - - - b0aa235b by Ran ShemTov at 2017-11-13T11:35:18+01:00 CHANNELMGR-1510 Fix unit test bugs for step-2 component spec - - - - - 510e9196 by Ran ShemTov at 2017-11-13T13:00:37+01:00 CHANNELMGR-1510 Remove testing for private methods - - - - - 5c303818 by Ran ShemTov at 2017-11-13T15:19:53+01:00 CHANNELMGR-1510 Add dialogService mocks and remove form resetting method - - - - - 7ea5352e by Ran ShemTov at 2017-11-13T15:47:16+01:00 Merge branch feature/create-content into feature/CC-CHANNELMGR-1510 # Conflicts: # frontend-ng/src/app/app.module.ts # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts #
