[HippoCMS-scm] [Git][cms-community/hippo-testsuite][master] HSTTWO-3180 Fix the solr data directory to work on Windows
Arent-Jan Banck pushed to branch master at cms-community / hippo-testsuite
Commits:
819e4d7c by Arent-Jan Banck at 2017-11-13T20:57:47+01:00
HSTTWO-3180 Fix the solr data directory to work on Windows
- - - - -
1 changed file:
- solr/src/main/webapp/WEB-INF/solr/conf/solrconfig.xml
Changes:
=
solr/src/main/webapp/WEB-INF/solr/conf/solrconfig.xml
=
--- a/solr/src/main/webapp/WEB-INF/solr/conf/solrconfig.xml
+++ b/solr/src/main/webapp/WEB-INF/solr/conf/solrconfig.xml
@@ -91,7 +91,7 @@
-
+
-
- ../../${repo.path:}/solr
+ ${solr.data.dir:}
-
-
+ -->
true
managed-schema
@@ -176,12 +172,12 @@
many threads arrive they will wait for others to finish.
Default in Solr/Lucene is 8. -->
-
+
-
+
-
+
+ -->
-
+
+ This is not needed if lock type is 'single'
+ -->
@@ -418,7 +414,7 @@
-->
-
+
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1881] REPO-1881 move specific tests which cannot reuse an previously started…
Ate Douma pushed to branch feature/REPO-1881 at cms-community / hippo-repository
Commits:
23d39e1c by Ate Douma at 2017-11-13T17:15:43+01:00
REPO-1881 move specific tests which cannot reuse an previously started
repository to integration test phase
- - - - -
2 changed files:
- engine/pom.xml
- engine/src/test/java/org/hippoecm/repository/RefreshTest.java
Changes:
=
engine/pom.xml
=
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -171,11 +171,38 @@
org.apache.maven.plugins
maven-surefire-plugin
+
+**/RefreshTest.java
+
**/ExternalRepositorySyncRevisionServiceTest.java
+
**/ExternalRepositorySyncRevisionServiceNoClusterTest.java
+
true
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
+**/RefreshTest.java
+
**/ExternalRepositorySyncRevisionServiceTest.java
+
**/ExternalRepositorySyncRevisionServiceNoClusterTest.java
+
+
+
false
+
+
+
+
+
=
engine/src/test/java/org/hippoecm/repository/RefreshTest.java
=
--- a/engine/src/test/java/org/hippoecm/repository/RefreshTest.java
+++ b/engine/src/test/java/org/hippoecm/repository/RefreshTest.java
@@ -25,23 +25,11 @@ import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.hippoecm.repository.api.HippoNodeType;
-
-import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.onehippo.repository.testutils.RepositoryTestCase;
public class RefreshTest {
-@BeforeClass
-public static void clearRepository() {
-// when run together with other RepositoryTestCase based tests *and*
-// -Dorg.onehippo.repository.test.keepserver=true
-// then an existing RepositoryImpl may already be (kept) running,
which can interfere with this test
-RepositoryTestCase.clearRepository();
-}
-
@Ignore
public void testRefreshAfterRemoveIssueJackrabbit() throws Exception {
Repository repository =
RepositoryImpl.create(RepositoryConfig.create(getClass().getResourceAsStream("jackrabbit.xml"),
"target"));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/23d39e1c00646f317b60f9ae2ff46ee1a750b276
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/23d39e1c00646f317b60f9ae2ff46ee1a750b276
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-1881] REPO-1887 [Backport 11.2] Make sure thread really stopped before continuing
Ate Douma pushed to branch feature/REPO-1881 at cms-community / hippo-repository
Commits:
db4470ab by Ard Schrijvers at 2017-11-13T17:12:40+01:00
REPO-1887 [Backport 11.2] Make sure thread really stopped before continuing
(cherry picked from commit 81d479e32ce07aab40b50c3ad6567475384616e6)
- - - - -
1 changed file:
- engine/src/test/java/org/onehippo/repository/lock/MemoryLockManagerTest.java
Changes:
=
engine/src/test/java/org/onehippo/repository/lock/MemoryLockManagerTest.java
=
---
a/engine/src/test/java/org/onehippo/repository/lock/MemoryLockManagerTest.java
+++
b/engine/src/test/java/org/onehippo/repository/lock/MemoryLockManagerTest.java
@@ -215,8 +215,9 @@ public class MemoryLockManagerTest {
countDownLatch2.countDown();
+LockResource lockResource = null;
try {
-final LockResource lockResource = futureLock.get();
+lockResource = futureLock.get();
assertEquals("123",
memoryLockManager.getLocks().iterator().next().getLockKey());
assertEquals(lockResource.getHolder().getName(),
memoryLockManager.getLocks().iterator().next().getLockThread());
@@ -227,6 +228,9 @@ public class MemoryLockManagerTest {
executorService.shutdown();
// The lockThread did not unlock but since the thread is not live any
more, the lock
// should again be eligible for other threads
+while (lockResource.getHolder().isAlive()) {
+Thread.sleep(10);
+}
try (Log4jInterceptor interceptor =
Log4jInterceptor.onWarn().trap(MemoryLockManager.class).build()) {
assertEquals(0, memoryLockManager.getLocks().size());
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/db4470ab03a6cf8348f21587492c82ee8601398d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/db4470ab03a6cf8348f21587492c82ee8601398d
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/CHANNELMGR-1570
Minos Chatzidakis pushed new branch feature/CHANNELMGR-1570 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1570 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-1543] CHANNELMGR-1543 Add another expect expression to the tests and fix failing test…
Ariel Weinberger pushed to branch feature/CC-CHANNELMGR-1543 at cms-community /
hippo-addon-channel-manager
Commits:
8faea2ae by Ariel Weinberger at 2017-11-13T17:04:31+01:00
CHANNELMGR-1543 Add another expect expression to the tests and fix failing test
for lowerSidePanelBeneathMask
- - - - -
1 changed file:
- frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
=
--- a/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
+++ b/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
@@ -70,17 +70,20 @@ describe('SidePanelService', () => {
expect(SidePanelService.isSidePanelLifted).toBeTruthy();
SidePanelService.isSidePanelLifted = true;
-SidePanelService.liftSidePanelBelowMask();
+SidePanelService.lowerSidePanelBeneathMask();
expect(SidePanelService.isSidePanelLifted).toBeFalsy();
});
it('calls the onCloseCallback when $mdSidenav.close is triggered from
AngularJS Material\'s side', () => {
const element = angular.element('');
+spyOn(SidePanelService, 'close');
+
leftSidePanel.onClose.and.callFake(fn => leftSidePanel.onCloseCb = fn);
leftSidePanel.close.and.callFake(() => leftSidePanel.onCloseCb());
SidePanelService.initialize('left', element);
-SidePanelService.$mdSidenav('test').close();
+SidePanelService.$mdSidenav('test').close(); // "Native" AngularJS close
function, as if we were pressing Escape
+expect(SidePanelService.close).toHaveBeenCalledWith('left');
});
it('forwards the is-open check to the mdSidenav service', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8faea2aeed9893b3f0a40dfdee41b1617b30b7e0
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8faea2aeed9893b3f0a40dfdee41b1617b30b7e0
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-1543] CHANNELMGR-1543 Add unit tests to make SidePanelService fully covered
Ariel Weinberger pushed to branch feature/CC-CHANNELMGR-1543 at cms-community /
hippo-addon-channel-manager
Commits:
8a84460c by Ariel Weinberger at 2017-11-13T17:01:16+01:00
CHANNELMGR-1543 Add unit tests to make SidePanelService fully covered
- - - - -
1 changed file:
- frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
=
--- a/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
+++ b/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
@@ -64,6 +64,25 @@ describe('SidePanelService', () => {
expect(leftSidePanel.close).toHaveBeenCalled();
});
+ it('lifts and lowers side panel above mask', () => {
+SidePanelService.isSidePanelLifted = false;
+SidePanelService.liftSidePanelAboveMask();
+expect(SidePanelService.isSidePanelLifted).toBeTruthy();
+
+SidePanelService.isSidePanelLifted = true;
+SidePanelService.liftSidePanelBelowMask();
+expect(SidePanelService.isSidePanelLifted).toBeFalsy();
+ });
+
+ it('calls the onCloseCallback when $mdSidenav.close is triggered from
AngularJS Material\'s side', () => {
+const element = angular.element('');
+
+leftSidePanel.onClose.and.callFake(fn => leftSidePanel.onCloseCb = fn);
+leftSidePanel.close.and.callFake(() => leftSidePanel.onCloseCb());
+SidePanelService.initialize('left', element);
+SidePanelService.$mdSidenav('test').close();
+ });
+
it('forwards the is-open check to the mdSidenav service', () => {
const element = angular.element('');
SidePanelService.initialize('left', element);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8a84460c9d27a44e243de49a60db447e56e546c2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8a84460c9d27a44e243de49a60db447e56e546c2
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-1575
Arthur Bogaart pushed new branch feature/CC-CHANNELMGR-1575 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-1575 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-plugin-poll] Deleted branch feature/HIPPLUG-1481
Jeroen Hoffman deleted branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll --- 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-plugin-poll][master] 12 commits: HIPPLUG-1481 add demo as essentials plugin
Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-poll
Commits:
223557d0 by Bert Leunis at 2017-08-15T13:45:58+02:00
HIPPLUG-1481 add demo as essentials plugin
- - - - -
a66db3e4 by Jeroen Hoffman at 2017-10-18T12:02:04+02:00
HIPPLUG-1481 Merge branch master into feature/HIPPLUG-1481
- - - - -
35747858 by Jeroen Hoffman at 2017-10-20T10:07:15+02:00
HIPPLUG-1481 fix for the example polldata XML imported into /polldemo, must be
/polldata/{{ namespace}}.
Rename the new artifact hippo-plugin-poll-essentials-demo-feature
in module essentials-demo-feature
- - - - -
6b6c8df5 by Jeroen Hoffman at 2017-10-20T10:12:02+02:00
HIPPLUG-1481 remove unused folder/files
- - - - -
736a0004 by Jeroen Hoffman at 2017-10-20T10:15:25+02:00
HIPPLUG-1481 temp rename (camelCase file issue)
- - - - -
17bf49f1 by Jeroen Hoffman at 2017-10-20T10:17:04+02:00
HIPPLUG-1481 temp rename back (back to lowercase custom)
- - - - -
d915e268 by Jeroen Hoffman at 2017-10-20T10:19:07+02:00
HIPPLUG-1481 remove the demo files, except the new README
- - - - -
592743a2 by Jeroen Hoffman at 2017-10-20T10:25:21+02:00
HIPPLUG-1481 in README, describe what the feature does.
- - - - -
bd062bff by Jeroen Hoffman at 2017-10-20T10:41:16+02:00
HIPPLUG-1481 remove remaining _demo_creation (shouldve been gone before)
- - - - -
26704d11 by Jeroen Hoffman at 2017-11-13T15:16:38+01:00
HIPPLUG-1481 merge 3 instructionSet elements into 1 because having
optional parts is not applicable here
- - - - -
29db7c7e by Jeroen Hoffman at 2017-11-13T15:20:42+01:00
HIPPLUG-1481 Reintegrate branch feature/HIPPLUG-1481 into master
- - - - -
91f6b876 by Jeroen Hoffman at 2017-11-13T16:24:01+01:00
HIPPLUG-1481 Strip all sub-elements of essentials-demo-feature/pom.xml, just
leaving the basics will do
- - - - -
30 changed files:
- demo/README.txt
- − demo/_demo_creation/README.txt
- − demo/bootstrap/configuration/pom.xml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport-module.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-document.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-folder.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-resource-bundle.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-untranslated-folder.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/default/catalog.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages/base.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/catalog.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/components.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/custompoll.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/homepage.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/pagenotfound.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/prototypepages.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemap.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemenus.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/templates.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/channel.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/containers.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/pages.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/sitemap.yaml
- −
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/sitemenus.yaml
- − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
- − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
The diff was not included because it is too large.
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1510 Add @ngx-translate/core to the package.json file
Ran Shem Tov pushed to branch feature/create-content at cms-community / hippo-addon-channel-manager Commits: d05a225e by Ran ShemTov at 2017-11-13T16:23:02+01:00 CHANNELMGR-1510 Add @ngx-translate/core to the package.json file - - - - - 1 changed file: - frontend-ng/package.json Changes: = frontend-ng/package.json = --- a/frontend-ng/package.json +++ b/frontend-ng/package.json @@ -35,6 +35,7 @@ "@angular/router": "4.3.6", "@angular/upgrade": "4.3.6", "@bloomreach/dragula": "3.7.2-br.3", +"@ngx-translate/core": "^8.0.0", "@ngx-translate/http-loader": "^2.0.0", "angular": "1.5.11", "angular-animate": "1.5.11", View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d05a225e1cbbeac4ed350442bea725256ece7e6d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d05a225e1cbbeac4ed350442bea725256ece7e6d 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] 24 commits: CHANNELMGR-1510 Initialise create content step 2 component
Ran Shem Tov pushed to branch feature/create-content 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 - - - - - 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 # frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.module.ts #
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1510] 25 commits: CHANNELMGR-1511 Implement REST call to delete a document
Ran Shem Tov pushed to branch feature/CC-CHANNELMGR-1510 at cms-community /
hippo-addon-channel-manager
Commits:
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.
- - - - -
e8ed48d9 by Arthur Bogaart at 2017-11-07T00:16:46+01:00
CHANNELMGR-1481 Add folders/{path} endpoint
Retrieves a list of Folder instances based on the provided path. A
Folder instance contains a name, displayName, locale and path. All
folders in the provided path are considered valid. If a node referenced
by the path exists, the displayName and locale are copied from it. If
the locale is null, it will be copied from the parent.
In case of a non-existing node, the displayName will equal the input
value and the locale will be copied from the parent, or null.
- - - - -
64651368 by Arthur Bogaart at 2017-11-07T00:21:19+01:00
CHANNELMGR-1481 Add ChannelService provider
- - - - -
482cf8a3 by Arthur Bogaart at 2017-11-07T00:38:58+01:00
CHANNELMGR-1481 Add document-location component
Renders a relative path based on the picked path for this component, and the
configured root path.
- - - - -
fa9343c1 by Arthur Bogaart at 2017-11-07T00:40:45+01:00
CHANNELMGR-1481 Add getFolders to create-content-service
- - - - -
dd780039 by Arthur Bogaart at 2017-11-07T00:42:14+01:00
CHANNELMGR-1481 Use DocumentLocationField in step-1
- - - - -
ce2c8b2a by Arthur Bogaart at 2017-11-07T00:44:50+01:00
CHANNELMGR-1481 Merge feature/create-content changes
- - - - -
d08faffa by Arthur Bogaart at 2017-11-07T14:12:19+01:00
CHANNELMGR-1566 Bump frontend-build to 7.0.0-beta.3
- - - - -
6f6bdbb7 by Ariel Weinberger at 2017-11-07T16:59:28+01:00
CHANNELMGR-1543 Add CSS rule to animate max-width of the wrapping right side
panel component
- - - - -
2b50b9a5 by Mathijs den Burger at 2017-11-08T09:21:32+01:00
CHANNELMGR-1511 Merge branch feature/create-content
- - - - -
b36917e9 by Ariel Weinberger at 2017-11-08T13:20:13+01:00
CHANNELMGR-1543 Apply CSS transition on right side panels
max-width property, and call sidePanelService.close to close the
mdSidenav
- - - - -
44960f4a by Mathijs den Burger at 2017-11-08T15:05:26+01:00
CHANNELMGR-1543 Fix closing of edit-content panel
The closePanel() method removed in the previous commit was used by the
edit-content panel, so it had to be added back. Added a on-close
callback to the edit-content component so it can trigger the
closePanel() method in the same way as the step-1 component instead of
calling the SidePanelService directly.
Still TODO: adjusts the unit tests.
- - - - -
b4ccc06e by Ariel Weinberger at 2017-11-08T15:41:53+01:00
CHANNELMGR-1543 Add unit tests for changes to rightSidePanel, refactor existing
tests and fix description texts
- - - - -
a77d2557 by Ariel Weinberger at 2017-11-08T15:46:56+01:00
Merge branch feature/CC-CHANNELMGR-1543 into feature/create-content
- - - - -
fcea143e by Mathijs den Burger at 2017-11-08T17:28:00+01:00
CHANNELMGR-1511 Also delete newly created drafts
DocumentWorkflow.delete() actually archives a document, e.g. moves it
to the attic, stripped of all data, to keep a pointer into version
history. Thats fine for existing documents that are allowed to be
deleted (e.g. an offline document).
But: DocumentWorkflow.delete() is also not allowed for newly created
drafts. To delete those, FolderWorkflow.delete() can be used. Which has
the nice bonus that it does not archive the deleted document, which is
not needed for new drafts anyway. We therefore use the term erase to
make a distinction from delete.
However, FolderWorkflow.delete() also deletes any existing document
without problems. Thats a bit dangerous, so we only want to use it for
newly created drafts. We therefore check whether the document has a
preview variant. If so, we dont allow the document to be deleted via
the FolderWorkflow (it should have been deleted by the DocumentWorkflow
already). Only documents without a preview variant are then
actually erased.
- - - - -
919bb607 by Michael Metternich at 2017-11-09T12:02:16+01:00
CHANNELMGR-1511 Minor code quality improvements
- - - - -
15f9f73a by Arthur Bogaart at 2017-11-09T12:19:01+01:00
CHANNELMGR-1481 Move channel.service.provider to shared services
- remove unused imports
- - - - -
08143f29 by Arthur Bogaart at 2017-11-09T12:23:21+01:00
CHANNELMGR-1481 Remove ElementRef and use explicit .js imports
- Removed Folder import as it was not used
- - - - -
8b016d41 by Arthur Bogaart at 2017-11-09T12:26:54+01:00
CHANNELMGR-1481
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1543] CHANNELMGR-1543 Service calls onCloseCallback when the sidenav is closed by the ESC key
Ariel Weinberger pushed to branch feature/CC-CHANNELMGR-1543 at cms-community /
hippo-addon-channel-manager
Commits:
125a1f85 by Ariel Weinberger at 2017-11-13T15:40:57+01:00
CHANNELMGR-1543 Service calls onCloseCallback when the sidenav is closed by the
ESC key
- - - - -
2 changed files:
- frontend-ng/src/app/channel/sidePanels/sidePanel.service.js
- frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/sidePanel.service.js
=
--- a/frontend-ng/src/app/channel/sidePanels/sidePanel.service.js
+++ b/frontend-ng/src/app/channel/sidePanels/sidePanel.service.js
@@ -28,10 +28,11 @@ class SidePanelService {
const panel = {
jQueryElement,
sideNavComponentId: jQueryElement.attr('md-component-id'),
- onOpenCallback: onOpenCallback || angular.noop,
+ onOpenCallback: onOpenCallback || (() => this.$q.resolve()),
onCloseCallback: onCloseCallback || (() => this.$q.resolve()),
};
+this.$mdSidenav(panel.sideNavComponentId).onClose(() => this.close(side));
this.panels[side] = panel;
}
=
frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
=
--- a/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
+++ b/frontend-ng/src/app/channel/sidePanels/sidePanel.service.spec.js
@@ -24,7 +24,7 @@ describe('SidePanelService', () => {
beforeEach(() => {
angular.mock.module('hippo-cm');
-leftSidePanel = jasmine.createSpyObj('leftSidePanel', ['isOpen', 'toggle',
'open', 'close']);
+leftSidePanel = jasmine.createSpyObj('leftSidePanel', ['isOpen', 'toggle',
'open', 'close', 'onClose', 'onCloseCb']);
OverlayService = jasmine.createSpyObj('OverlayService', ['sync']);
const $mdSidenav =
jasmine.createSpy('$mdSidenav').and.returnValue(leftSidePanel);
@@ -45,7 +45,7 @@ describe('SidePanelService', () => {
});
it('toggles a named side-panel', () => {
-const element = angular.element('');
+const element = angular.element('');
element.width(250);
SidePanelService.initialize('left', element);
@@ -65,7 +65,7 @@ describe('SidePanelService', () => {
});
it('forwards the is-open check to the mdSidenav service', () => {
-const element = angular.element('');
+const element = angular.element('');
SidePanelService.initialize('left', element);
leftSidePanel.isOpen.and.returnValue(true);
@@ -81,7 +81,7 @@ describe('SidePanelService', () => {
});
it('closes a side panel if it is open', (done) => {
-const element = angular.element('');
+const element = angular.element('');
SidePanelService.initialize('left', element);
leftSidePanel.isOpen.and.returnValue(true);
@@ -94,7 +94,7 @@ describe('SidePanelService', () => {
});
it('skips closing a side panel if it is was already closed', (done) => {
-const element = angular.element('');
+const element = angular.element('');
SidePanelService.initialize('left', element);
leftSidePanel.isOpen.and.returnValue(false);
@@ -107,7 +107,7 @@ describe('SidePanelService', () => {
});
it('calls the onCloseCallback before closing a side panel', (done) => {
-const element = angular.element('');
+const element = angular.element('');
const onClose = jasmine.createSpy('onClose');
SidePanelService.initialize('left', element, null, onClose);
@@ -123,7 +123,7 @@ describe('SidePanelService', () => {
});
it('does not close a side panel if its onCloseCallback fails', (done) => {
-const element = angular.element('');
+const element = angular.element('');
const onClose = jasmine.createSpy('onClose');
SidePanelService.initialize('left', element, null, onClose);
@@ -139,7 +139,7 @@ describe('SidePanelService', () => {
});
it('forwards the open call to the mdSidenav service', () => {
-const element = angular.element('');
+const element = angular.element('');
SidePanelService.initialize('left', element);
SidePanelService.open('left');
@@ -183,7 +183,7 @@ describe('SidePanelService', () => {
});
it('syncs the iframe once the side-panel has been opened and closed', () => {
-const element = angular.element('');
+const element = angular.element('');
SidePanelService.initialize('left', element);
leftSidePanel.isOpen.and.returnValue(false);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/125a1f85090d30d1938cb0e4a46bfded00868bce
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/125a1f85090d30d1938cb0e4a46bfded00868bce
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 merge 3 elements into 1 because having optional…
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: 26704d11 by Jeroen Hoffman at 2017-11-13T15:16:38+01:00 HIPPLUG-1481 merge 3 instructionSet elements into 1 because having optional parts is not applicable here - - - - - 4 changed files: - demo/README.txt - essentials-demo-feature/README.txt - 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 Changes: = demo/README.txt = --- a/demo/README.txt +++ b/demo/README.txt @@ -17,7 +17,7 @@ How to generate a demo project for the Polls feature - With Essentials, set up the project with the default settings. Note that JSP for templating language is not supported for the Polls Demo feature. -- With Essentials, install Polls feature, then rebuild && run twice ((boarding, installing). +- With Essentials, install Polls feature, then rebuild && run twice (boarding, installing). - With Essentials, install Polls Demo feature, then rebuild && run. = essentials-demo-feature/README.txt = --- a/essentials-demo-feature/README.txt +++ b/essentials-demo-feature/README.txt @@ -1,6 +1,6 @@ -Hippo Essentials Plugin Feature -=== -This module contains a Hippo Essentials Plugin Feature. It adds a custom poll document: a document in the project +Hippo Essentials Demo Feature += +This module contains a Hippo Essentials Demo Feature. It adds a custom poll document: a document in the project namespace with a title and the poll compound. It also adds a rendering template and some HST configuration for it. To use this feature, add a dependency to this artifact to the Essentials module of a Hippo project. After a (re)build it = 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 @@ -3,38 +3,31 @@ 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,7 +1,4 @@ - - - - + has-no-templates="true"> + \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464 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-1888] REPO-1888 Tweak logging for applying content to avoid log+rethrow and…
Peter Centgraf pushed to branch feature/REPO-1888 at cms-community /
hippo-repository
Commits:
24570e55 by Peter Centgraf at 2017-11-13T14:51:48+01:00
REPO-1888 Tweak logging for applying content to avoid log+rethrow and
suppressing useful stack traces
- - - - -
2 changed files:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
- engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java
@@ -167,13 +167,7 @@ public class ConfigurationContentService {
baseNodePath, contentDefinition.getOrigin(),
action));
}
} catch (Exception ex) {
-final String errorMsg = String.format("Processing '%s'
action for content node '%s' failed.", action, baseNodePath);
-if (ex instanceof ConfigurationRuntimeException) {
-// no stacktrace needed, the exception message should
be informative enough
-log.error(errorMsg + "\n" + ex.getMessage());
-} else {
-log.error(errorMsg, ex);
-}
+log.error("Processing '{}' action for content node '{}'
failed.", action, baseNodePath, ex);
failedPaths.add(baseNodePath);
// we need to clear changes in progress, since they
apparently cause the session save to fail
=
engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
=
--- a/engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java
@@ -145,7 +145,7 @@ public class JcrContentProcessor {
applyNode(definitionNode, parentNode, actionType,
unprocessedReferences);
applyUnprocessedReferences(unprocessedReferences);
} catch (Exception e) {
-log.warn(String.format("Content definition processing failed: %s",
definitionNode.getPath()));
+// don't log here, since the caller will need to handle this anyway
if (e instanceof RepositoryException) {
throw (RepositoryException) e;
} else if (e instanceof RuntimeException){
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/24570e556f9eebf0609916ebd01673f22ced70e9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/24570e556f9eebf0609916ebd01673f22ced70e9
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-1888
Peter Centgraf pushed new branch feature/REPO-1888 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1888 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-jackrabbit] Deleted branch hippo/bugfix/REPO-1884
Ate Douma deleted branch hippo/bugfix/REPO-1884 at cms-community / hippo-jackrabbit --- 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-essentials][feature/create-content] ESSENTIALS-1110 Set create-content tag
Michael Metternich pushed to branch feature/create-content at cms-community / hippo-essentials Commits: 0a3e9917 by Michael Metternich at 2017-11-13T13:56:57+01:00 ESSENTIALS-1110 Set create-content tag - - - - - 30 changed files: - dashboard-dependencies/pom.xml - dashboard/pom.xml - plugin-sdk/api/pom.xml - plugin-sdk/implementation/pom.xml - plugin-sdk/pom.xml - plugins/banner-and-carousel/pom.xml - plugins/bean-writer/pom.xml - plugins/blog/pom.xml - plugins/bloomreach-connector/pom.xml - plugins/content-blocks/pom.xml - plugins/document-wizard/pom.xml - plugins/events/pom.xml - plugins/faq/pom.xml - plugins/gallery-manager/pom.xml - plugins/google-maps/pom.xml - plugins/image-component/pom.xml - plugins/list/pom.xml - plugins/menu/pom.xml - plugins/more-like-this/pom.xml - plugins/news/pom.xml - plugins/poll/pom.xml - plugins/pom.xml - plugins/products-category/pom.xml - plugins/products-grid-category/pom.xml - plugins/products-grid-query/pom.xml - plugins/products-grid/pom.xml - plugins/related-documents/pom.xml - plugins/rest-services/pom.xml - plugins/robots/pom.xml - plugins/search/pom.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/0a3e9917e5277cc5d2a29a2483783b5fb39ff5bf --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/0a3e9917e5277cc5d2a29a2483783b5fb39ff5bf 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-essentials][feature/create-content] ESSENTIALS-1110 Remove create-content tag
Michael Metternich pushed to branch feature/create-content at cms-community / hippo-essentials Commits: b01f9ed5 by Michael Metternich at 2017-11-13T13:53:55+01:00 ESSENTIALS-1110 Remove create-content tag - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ Hippo Essentials Hippo Essentials hippo-essentials - 4.1.0-create-content-SNAPSHOT + 4.1.0-SNAPSHOT pom View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/b01f9ed54d0024ac8b5155b1d44b950fecdc4a5a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/b01f9ed54d0024ac8b5155b1d44b950fecdc4a5a 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-1543
Ariel Weinberger pushed new branch feature/CC-CHANNELMGR-1543 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-1543 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-essentials] Pushed new branch feature/create-content
Michael Metternich pushed new branch feature/create-content at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/create-content 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] 2 commits: CHANNELMGR-1563 Fix top padding of edit-form
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1563 at cms-community /
hippo-addon-channel-manager
Commits:
6f0f6b66 by Arthur Bogaart at 2017-11-10T21:44:33+01:00
CHANNELMGR-1563 Fix top padding of edit-form
- - - - -
51818fc5 by Arthur Bogaart at 2017-11-10T21:50:27+01:00
CHANNELMGR-1563 Replace material layout with @angular/flexlayout in new
templates
- use fx directives
- replaced rightSidePanel-content #id with CSS class right-side-panel-content
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-1/step-1.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
- frontend-ng/src/app/shared/shared.module.ts
Changes:
=
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
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
@@ -36,11 +36,9 @@
-
-
+
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.html
@@ -59,7 +59,7 @@
+class="right-side-panel-content">
+class="form-dense-layout edit-content-form">
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
@@ -29,7 +29,7 @@ class SharedSpaceToolbar {
$onInit() {
this.SharedSpaceToolbarService.registerTriggerCallback(this.setToolbarVisible.bind(this));
this.sharedSpaceElement = this.$element.find('.ckeditor-shared-space');
-this.rightSidePanelContent = $('#rightSidePanel-content');
+this.rightSidePanelContent = $('.right-side-panel-content');
this.sharedSpaceElement.css('display', 'none');
}
=
frontend-ng/src/app/shared/shared.module.ts
=
--- a/frontend-ng/src/app/shared/shared.module.ts
+++ b/frontend-ng/src/app/shared/shared.module.ts
@@ -1,6 +1,7 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { FlexLayoutModule } from '@angular/flex-layout';
import { MaterialModule } from './material/material.module';
import { FeedbackServiceProvider } from './services/feedback.service.provider';
@@ -10,11 +11,13 @@ import { ContentServiceProvider } from
'./services/content.service.provider';
imports: [
BrowserModule,
BrowserAnimationsModule,
+FlexLayoutModule,
MaterialModule
],
exports: [
BrowserModule,
BrowserAnimationsModule,
+FlexLayoutModule,
MaterialModule,
],
providers: [
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/fe659c14b174afdae988295616b29810574fe97e...51818fc51309e472d39fe9cb327e730c6e0b2157
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/fe659c14b174afdae988295616b29810574fe97e...51818fc51309e472d39fe9cb327e730c6e0b2157
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][master] 2 commits: CMS-10916 Distinguish between required and resource-required validation
Michael Metternich pushed to branch master at cms-community / hippo-cms
Commits:
a7678553 by Michael Metternich at 2017-11-10T15:48:27+01:00
CMS-10916 Distinguish between required and resource-required validation
- - - - -
a1e51f37 by Michael Metternich at 2017-11-13T10:10:33+01:00
CMS-10916 Reintegrate bugfix/CMS-10916
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/FieldEditor.java
@@ -33,6 +33,7 @@ import
org.hippoecm.frontend.plugins.standards.list.resolvers.CssClass;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
import org.hippoecm.frontend.types.TypeException;
+import org.hippoecm.repository.api.HippoNodeType;
public class FieldEditor extends Panel {
@@ -105,18 +106,20 @@ public class FieldEditor extends Panel {
}
@Override
-public void setObject(final Boolean object) {
+public void setObject(final Boolean isRequired) {
final IFieldDescriptor field = getDescriptor();
-if (object) {
-field.addValidator("required");
-if (field.getTypeDescriptor().isType("String")) {
+final ITypeDescriptor typeDescriptor =
field.getTypeDescriptor();
+final String validatorDescription =
typeDescriptor.isType(HippoNodeType.NT_RESOURCE) ? "resource-required" :
"required";
+if (isRequired) {
+field.addValidator(validatorDescription);
+if (typeDescriptor.isType("String")) {
field.addValidator("non-empty");
}
} else {
-if (field.getTypeDescriptor().isType("String")) {
+if (typeDescriptor.isType("String")) {
field.removeValidator("non-empty");
}
-field.removeValidator("required");
+field.removeValidator(validatorDescription);
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/8d0c7d2dd09754068d16564025ab98eefe75036f...a1e51f374caab3ce3efbeba920803448210eca86
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/8d0c7d2dd09754068d16564025ab98eefe75036f...a1e51f374caab3ce3efbeba920803448210eca86
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] Deleted branch bugfix/CMS-10916
Michael Metternich deleted branch bugfix/CMS-10916 at cms-community / hippo-cms --- 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-essentials] Deleted branch bugfix/ESSENTIALS-1048
Tobias Jeger deleted branch bugfix/ESSENTIALS-1048 at cms-community / hippo-essentials --- 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-essentials] Pushed new branch feature/ESSENTIALS-1095
Tobias Jeger pushed new branch feature/ESSENTIALS-1095 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1095 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
