[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1873] REPO-1874 suppress expected log4j ERROR message
Ate Douma pushed to branch feature/REPO-1873 at cms-community / hippo-repository
Commits:
8cb819ca by Ate Douma at 2017-11-01T01:15:01+01:00
REPO-1874 suppress expected log4j ERROR message
- - - - -
1 changed file:
- test/src/test/java/org/hippoecm/repository/quartz/SchedulerTest.java
Changes:
=
test/src/test/java/org/hippoecm/repository/quartz/SchedulerTest.java
=
--- a/test/src/test/java/org/hippoecm/repository/quartz/SchedulerTest.java
+++ b/test/src/test/java/org/hippoecm/repository/quartz/SchedulerTest.java
@@ -32,6 +32,7 @@ import
org.onehippo.repository.scheduling.RepositoryJobSimpleTrigger;
import org.onehippo.repository.scheduling.RepositoryJobTrigger;
import org.onehippo.repository.scheduling.RepositoryScheduler;
import org.onehippo.repository.testutils.RepositoryTestCase;
+import org.onehippo.testutils.log4j.Log4jInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,8 +97,10 @@ public class SchedulerTest extends RepositoryTestCase {
final RepositoryJobTrigger testJobTrigger = new
RepositoryJobSimpleTrigger("test", new Date(System.currentTimeMillis() + 2500));
scheduler.scheduleJob(testJobInfo, testJobTrigger);
scheduler.deleteJob(testJobInfo.getName(), testJobInfo.getGroup());
-if (waitUntilExecuted()) {
-fail("Deleted job was still executed.");
+try (Log4jInterceptor ignore =
Log4jInterceptor.onError().deny(JCRJobStore.class).build()) {
+if (waitUntilExecuted()) {
+fail("Deleted job was still executed.");
+}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/8cb819ca0a01aa876b1e379dba456b7253013f42
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/8cb819ca0a01aa876b1e379dba456b7253013f42
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/CHANNELMGR-1555] CHANNELMGR-1555 Bump frontend-build to 7.0.0-beta.1
Arthur Bogaart pushed to branch feature/CHANNELMGR-1555 at cms-community /
hippo-addon-channel-manager
Commits:
54c58e59 by Arthur Bogaart at 2017-10-31T16:46:24+01:00
CHANNELMGR-1555 Bump frontend-build to 7.0.0-beta.1
- - - - -
1 changed file:
- frontend-ng/package.json
Changes:
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -57,7 +57,7 @@
"zone.js": "0.8.17"
},
"devDependencies": {
-"@bloomreach/frontend-build": "7.0.0-beta.0",
+"@bloomreach/frontend-build": "7.0.0-beta.1",
"@types/jasmine": "2.5.54",
"@types/node": "8.0.28",
"@types/webpack-env": "1.13.1",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/54c58e593478b88afeb5177289e318ba6757632f
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/54c58e593478b88afeb5177289e318ba6757632f
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/CHANNELMGR-1555] CHANNELMGR-1555 Bump frontend-build to 7.0.0-beta.0
Arthur Bogaart pushed to branch feature/CHANNELMGR-1555 at cms-community /
hippo-addon-channel-manager
Commits:
8ef723db by Arthur Bogaart at 2017-10-31T16:29:51+01:00
CHANNELMGR-1555 Bump frontend-build to 7.0.0-beta.0
- - - - -
1 changed file:
- frontend-ng/package.json
Changes:
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -57,7 +57,7 @@
"zone.js": "0.8.17"
},
"devDependencies": {
-"@bloomreach/frontend-build":
"git+https://code.onehippo.org/cms-community/hippo-frontend-build.git#feature/FEBUILD-121;,
+"@bloomreach/frontend-build": "7.0.0-beta.0",
"@types/jasmine": "2.5.54",
"@types/node": "8.0.28",
"@types/webpack-env": "1.13.1",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8ef723dba22a3abf8922bf6165400e47a3ea0a6e
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8ef723dba22a3abf8922bf6165400e47a3ea0a6e
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/CHANNELMGR-1555] CHANNELMGR-1555 Rename even more .d to .types
Arthur Bogaart pushed to branch feature/CHANNELMGR-1555 at cms-community /
hippo-addon-channel-manager
Commits:
d2bff3bc by Arthur Bogaart at 2017-10-31T14:44:45+01:00
CHANNELMGR-1555 Rename even more .d to .types
- - - - -
3 changed files:
- frontend-ng/package.json
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
Changes:
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -11,6 +11,7 @@
"scripts": {
"build": "gulp build",
"buildDev": "gulp buildDev",
+"buildDll": "gulp buildDll",
"buildProfile": "gulp buildProfile",
"clean": "gulp clean",
"gulp": "gulp",
@@ -18,8 +19,7 @@
"startDist": "gulp startDist",
"test": "gulp test",
"testDebug": "gulp testDebug",
-"testOnce": "gulp testOnce",
-"buildDll": "gulp buildDll"
+"testOnce": "gulp testOnce"
},
"dependencies": {
"@angular/animations": "4.3.6",
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
@@ -17,7 +17,7 @@
import { TestBed, inject } from '@angular/core/testing';
import ContentService from '../../../../services/content.service';
import { CreateContentService } from './create-content.service';
-import { TemplateQuery, DocumentTypeInfo } from './create-content.d';
+import { TemplateQuery, DocumentTypeInfo } from './create-content.types';
class MockContentService {
_send(): Promise {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/fromPromise';
import { Injectable } from '@angular/core';
-import { TemplateQuery } from './create-content.d';
+import { TemplateQuery } from './create-content.types';
import ContentService from '../../../../services/content.service';
@Injectable()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d2bff3bc4b31868827637b5fade03968635eaa2a
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d2bff3bc4b31868827637b5fade03968635eaa2a
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/CHANNELMGR-1555] CHANNELMGR-1555 Add buildDll NPM command, rename "vendors" to "vendor" and…
Ariel Weinberger pushed to branch feature/CHANNELMGR-1555 at cms-community /
hippo-addon-channel-manager
Commits:
c8e99695 by Ariel Weinberger at 2017-10-31T14:13:34+01:00
CHANNELMGR-1555 Add buildDll NPM command, rename vendors to
vendor and rename .d.ts files to .types.ts
- - - - -
5 changed files:
- frontend-ng/build.conf.js
- frontend-ng/package.json
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
→
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.types.ts
Changes:
=
frontend-ng/build.conf.js
=
--- a/frontend-ng/build.conf.js
+++ b/frontend-ng/build.conf.js
@@ -88,7 +88,7 @@ const customConfig = {
'@angular/upgrade',
'rxjs',
'zone.js'],
-vendors: [
+vendor: [
'@bloomreach/dragula',
'jquery',
'mutation-summary'],
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -18,7 +18,8 @@
"startDist": "gulp startDist",
"test": "gulp test",
"testDebug": "gulp testDebug",
-"testOnce": "gulp testOnce"
+"testOnce": "gulp testOnce",
+"buildDll": "gulp buildDll"
},
"dependencies": {
"@angular/animations": "4.3.6",
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
@@ -21,7 +21,7 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import 'rxjs/add/observable/throw';
-import { TemplateQuery, DocumentTypeInfo } from './create-content.d';
+import { TemplateQuery, DocumentTypeInfo } from './create-content.types';
import { CreateContentComponent } from './create-content.component';
import { CreateContentService } from './create-content.service';
import FeedbackService from '../../../../services/feedback.service';
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
@@ -19,7 +19,7 @@ import './create-content.scss';
import { NgForm } from '@angular/forms';
import { CreateContentService } from './create-content.service';
-import { CreateContentOptions, DocumentTypeInfo } from './create-content.d';
+import { CreateContentOptions, DocumentTypeInfo } from
'./create-content.types';
import FeedbackService from '../../../../services/feedback.service';
@Component({
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
→
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.types.ts
=
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c8e9969536fd0bdfb03e7ce9d3c241537cc63d6d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c8e9969536fd0bdfb03e7ce9d3c241537cc63d6d
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/CHANNELMGR-1555] CHANNELMGR-1555 Add DLL mapping
Arthur Bogaart pushed to branch feature/CHANNELMGR-1555 at cms-community /
hippo-addon-channel-manager
Commits:
c1b7f348 by Arthur Bogaart at 2017-10-31T12:57:18+01:00
CHANNELMGR-1555 Add DLL mapping
- - - - -
1 changed file:
- frontend-ng/build.conf.js
Changes:
=
frontend-ng/build.conf.js
=
--- a/frontend-ng/build.conf.js
+++ b/frontend-ng/build.conf.js
@@ -55,6 +55,44 @@ const customConfig = {
'/scripts/dragula.min.js':
'/base/node_modules/@bloomreach/dragula/dist/dragula.min.js',
},
},
+
+ dlls: {
+angularjs: [
+ 'angular',
+ 'angular-animate',
+ 'angular-aria',
+ 'angular-local-storage',
+ 'angular-material',
+ 'angular-messages',
+ 'angular-translate',
+ 'angular-translate-loader-static-files',
+ 'angular-ui-router',
+ 'angular-ui-tree',
+ 'ng-device-detector',
+ 'ng-focus-if'],
+angular: [
+ 'core-js',
+ 'hammerjs',
+ 'es6-shim',
+ '@angular/animations',
+ '@angular/cdk',
+ '@angular/common',
+ '@angular/compiler',
+ '@angular/core',
+ '@angular/forms',
+ '@angular/http',
+ '@angular/material',
+ '@angular/platform-browser',
+ '@angular/platform-browser-dynamic',
+ '@angular/router',
+ '@angular/upgrade',
+ 'rxjs',
+ 'zone.js'],
+vendors: [
+ '@bloomreach/dragula',
+ 'jquery',
+ 'mutation-summary'],
+ },
};
module.exports = customConfig;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c1b7f348341ff85123df767daab7d23b04d87e0d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c1b7f348341ff85123df767daab7d23b04d87e0d
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/CHANNELMGR-1555] CHANNELMGR-1555 Ignore DLL folder
Arthur Bogaart pushed to branch feature/CHANNELMGR-1555 at cms-community / hippo-addon-channel-manager Commits: efd61d80 by Arthur Bogaart at 2017-10-31T12:51:00+01:00 CHANNELMGR-1555 Ignore DLL folder - - - - - 1 changed file: - frontend-ng/.gitignore Changes: = frontend-ng/.gitignore = --- a/frontend-ng/.gitignore +++ b/frontend-ng/.gitignore @@ -1 +1,2 @@ .awcache/ +dll/ View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/efd61d80a96e4e55162ffcc0a860e5d7f011 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/efd61d80a96e4e55162ffcc0a860e5d7f011 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-1509
Mathijs den Burger pushed new branch feature/CC-CHANNELMGR-1509 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-1509 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 3 commits: CHANNELMGR-1544 Remove components tab if the channel is not editable (authors lack privileges)
Ran Shem Tov pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
c79baaed by Ran ShemTov at 2017-10-31T10:44:43+01:00
CHANNELMGR-1544 Remove components tab if the channel is not editable (authors
lack privileges)
- - - - -
b6d346a1 by Ran ShemTov at 2017-10-31T11:04:00+01:00
CHANNELMGR-1544 Use isEditable stright from service rather than binding between
controllers
- - - - -
adb2ec74 by Ran ShemTov at 2017-10-31T11:19:40+01:00
Reintegrate bugfix/CHANNELMGR-1544 into master
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
@@ -22,6 +22,7 @@ class LeftSidePanelCtrl {
CatalogService,
SiteMapService,
HippoIframeService,
+ChannelService,
) {
'ngInject';
@@ -31,6 +32,7 @@ class LeftSidePanelCtrl {
this.SiteMapService = SiteMapService;
this.HippoIframeService = HippoIframeService;
this.SiteMapService = SiteMapService;
+this.ChannelService = ChannelService;
SidePanelService.initialize('left', $element.find('.left-side-panel'));
}
@@ -67,6 +69,10 @@ class LeftSidePanelCtrl {
isSidePanelLifted() {
return this.SidePanelService.isSidePanelLifted;
}
+
+ isEditable() {
+return this.ChannelService.isEditable();
+ }
}
export default LeftSidePanelCtrl;
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -38,7 +38,7 @@
-
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/a621a31e5e28fe3ffabf425a4175dc2ac3b79e06...adb2ec74a25d9ad7ca06648b484254363bc1f03b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/a621a31e5e28fe3ffabf425a4175dc2ac3b79e06...adb2ec74a25d9ad7ca06648b484254363bc1f03b
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][bugfix/CHANNELMGR-1544] CHANNELMGR-1544 Use isEditable stright from service rather than binding between controllers
Ran Shem Tov pushed to branch bugfix/CHANNELMGR-1544 at cms-community /
hippo-addon-channel-manager
Commits:
b6d346a1 by Ran ShemTov at 2017-10-31T11:04:00+01:00
CHANNELMGR-1544 Use isEditable stright from service rather than binding between
controllers
- - - - -
4 changed files:
- frontend-ng/src/app/channel/channel.html
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
Changes:
=
frontend-ng/src/app/channel/channel.html
=
--- a/frontend-ng/src/app/channel/channel.html
+++ b/frontend-ng/src/app/channel/channel.html
@@ -68,7 +68,6 @@
flex>
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
@@ -21,7 +21,6 @@ const leftSidePanelComponent = {
bindings: {
componentsVisible: '=',
isConfigurationLocked: '<',
-isEditable: '<',
},
controller: LeftSidePanelCtrl,
template,
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
@@ -22,6 +22,7 @@ class LeftSidePanelCtrl {
CatalogService,
SiteMapService,
HippoIframeService,
+ChannelService,
) {
'ngInject';
@@ -31,6 +32,7 @@ class LeftSidePanelCtrl {
this.SiteMapService = SiteMapService;
this.HippoIframeService = HippoIframeService;
this.SiteMapService = SiteMapService;
+this.ChannelService = ChannelService;
SidePanelService.initialize('left', $element.find('.left-side-panel'));
}
@@ -67,6 +69,10 @@ class LeftSidePanelCtrl {
isSidePanelLifted() {
return this.SidePanelService.isSidePanelLifted;
}
+
+ isEditable() {
+return this.ChannelService.isEditable();
+ }
}
export default LeftSidePanelCtrl;
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -38,7 +38,7 @@
-
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b6d346a126e010f5e70a54b59b8ca22207462cb7
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b6d346a126e010f5e70a54b59b8ca22207462cb7
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1544
Ran Shem Tov pushed new branch bugfix/CHANNELMGR-1544 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1544 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-1510] 2 commits: CHANNELMGR-1510 Create binding between the name and url fields component to CC2
Ran Shem Tov pushed to branch feature/CC-CHANNELMGR-1510 at cms-community /
hippo-addon-channel-manager
Commits:
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
- - - - -
6 changed files:
-
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-2/nameUrlFieldsDialog/name-url-fields-dialog.controller.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step2.controller.js
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/name-url-fields/name-url-fields.component.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { Component, ElementRef, OnInit, Output, ViewChild } from
'@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild
} from '@angular/core';
import { Observable } from 'rxjs/rx';
@Component({
@@ -25,14 +25,20 @@ import { Observable } from 'rxjs/rx';
export class NameUrlFieldsComponent implements OnInit {
@ViewChild('form') form: HTMLFormElement;
@ViewChild('nameInputElement') nameInputElement: ElementRef;
- public urlField: string;
+ @Input('nameField') nameField: string;
+ @Input('urlField') urlField: string;
+ @Output() nameFieldChange: EventEmitter = new EventEmitter();
+ @Output() urlFieldChange: EventEmitter = new EventEmitter();
public urlEditMode: { state: boolean, oldValue: string } = { state: false,
oldValue: '' };
- public dummy: string;
ngOnInit() {
Observable.fromEvent(this.nameInputElement.nativeElement, 'keyup')
.debounceTime(1000)
- .subscribe(() =>
this.setDocumentUrlByName(this.form.controls.name.value));
+ .subscribe(() => {
+this.setDocumentUrlByName(this.nameField);
+this.nameFieldChange.next(this.nameField);
+this.urlFieldChange.next(this.urlField);
+ });
}
setDocumentUrlByName(name: string) {
=
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
@@ -18,7 +18,7 @@
-
+
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.controller.js
@@ -15,14 +15,20 @@
*/
class NameUrlFieldsDialogCtrl {
- constructor($mdDialog) {
+ constructor($mdDialog, locals) {
'ngInject';
this.$mdDialog = $mdDialog;
+this.name = locals.name;
+this.url = locals.url;
+this.title = locals.title;
}
- submit(form) {
-this.$mdDialog.hide(form);
+ submit() {
+this.$mdDialog.hide({
+ name: this.name,
+ url: this.url,
+});
}
cancel() {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/nameUrlFieldsDialog/name-url-fields-dialog.html
@@ -1,17 +1,23 @@
-
+
+
-
+ {{ ::$ctrl.title }}
+
+
+
{{ ::'CANCEL' | translate }}
+
{{ ::'CHANGE' | translate }}
+
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step2.controller.js
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1877
Mathijs den Burger pushed new branch feature/REPO-1877 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1877 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-taxonomy][release/4.0] HIPPLUG-1507 Use latest (snapshot) release to pull in latest plugin version.
Tobias Jeger pushed to branch release/4.0 at cms-community / hippo-plugin-taxonomy Commits: b4775d9f by Tobias Jeger at 2017-10-31T09:53:18+01:00 HIPPLUG-1507 Use latest (snapshot) release to pull in latest plugin version. - - - - - 1 changed file: - demo/pom.xml Changes: = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-release -12.0.2 +12.0.3-SNAPSHOT Hippo Plugin Taxonomy Demo View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/b4775d9f50603311f458777180053f70381c7b7f --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/b4775d9f50603311f458777180053f70381c7b7f 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-taxonomy][release/4.0] HIPPLUG-1507 Move content categorization from demo to plugin
Tobias Jeger pushed to branch release/4.0 at cms-community / hippo-plugin-taxonomy Commits: 0a6a8848 by Tobias Jeger at 2017-10-31T09:44:40+01:00 HIPPLUG-1507 Move content categorization from demo to plugin and fix auto-export setup in demo project (cherry picked from commit 2c7e90abd932e6ba7a38d34e620aeb08aa21afb5) (cherry picked from commit 6fb6346d2996a01329e896049a1dd882b7a2d44b) - - - - - 3 changed files: - addon/repository/src/main/resources/hcm-config/main.yaml - demo/plugin/src/main/resources/hcm-config/main.yaml - demo/repository-data/src/main/resources/hcm-config/main.yaml Changes: = addon/repository/src/main/resources/hcm-config/main.yaml = --- a/addon/repository/src/main/resources/hcm-config/main.yaml +++ b/addon/repository/src/main/resources/hcm-config/main.yaml @@ -3,3 +3,6 @@ definitions: hippotaxonomy: uri: http://www.hippoecm.org/hippotaxonomy/nt/1.2 cnd: hippotaxonomy.cnd + config: +/content/taxonomies: + .meta:category: content = demo/plugin/src/main/resources/hcm-config/main.yaml = --- a/demo/plugin/src/main/resources/hcm-config/main.yaml +++ b/demo/plugin/src/main/resources/hcm-config/main.yaml @@ -2,3 +2,8 @@ definitions: config: /hippo:namespaces/hippotaxonomy/taxonomy/editor:templates/_default_/root: plugin.class: org.onehippo.taxonomy.demo.plugin.AdditionalFieldCustomTaxonomyEditorPlugin +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['plugin'] \ No newline at end of file = demo/repository-data/src/main/resources/hcm-config/main.yaml = --- a/demo/repository-data/src/main/resources/hcm-config/main.yaml +++ b/demo/repository-data/src/main/resources/hcm-config/main.yaml @@ -37,5 +37,3 @@ definitions: operation: add type: string value: [sitewriters] -/content/taxonomies: - .meta:category: content View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/0a6a88482c20ce6f2bd71bb2876d077745ffab6a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/0a6a88482c20ce6f2bd71bb2876d077745ffab6a 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-release][release/12.0] CMS-16 Bump taxonomy plugin version
Tobias Jeger pushed to branch release/12.0 at cms-community / hippo-cms-release Commits: 28f6403a by Tobias Jeger at 2017-10-31T09:47:38+01:00 CMS-16 Bump taxonomy plugin version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 5.0.2 4.0.1 4.0.1 -4.0.2 + 4.0.3-SNAPSHOT 2.0.5 2.0.2 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/28f6403a71f5fe53a8e177282da04c82152dae94 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/28f6403a71f5fe53a8e177282da04c82152dae94 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-release][release/11.2] CMS-10615 bump CMS version to 4.2.7-SNAPSHOT on behalf of CMS-10960 and CMS-10964
Jeroen Hoffman pushed to branch release/11.2 at cms-community / hippo-cms-release Commits: 114a46b2 by Jeroen Hoffman at 2017-10-31T09:26:17+01:00 CMS-10615 bump CMS version to 4.2.7-SNAPSHOT on behalf of CMS-10960 and CMS-10964 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 4.2.2 3.2.1 3.2.0 -4.2.6 +4.2.7-SNAPSHOT 3.2.0 3.2.0 4.2.5-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/114a46b24e6514c7a1c96bb8fe95062a7e3758f8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/114a46b24e6514c7a1c96bb8fe95062a7e3758f8 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
