Michael Metternich pushed to branch feature/CC-CHANNELMGR-1512 at cms-community
/ hippo-addon-channel-manager
Commits:
7cc8cc79 by Michael Metternich at 2017-11-21T13:45:27+01:00
CHANNELMGR-1601 Add skinny profile to speed up build
- - - - -
9ba1c031 by Ariel Weinberger at 2017-11-21T14:04:05+01:00
CHANNELMGR-1513 Fix missing document name in discard dialog
- - - - -
6fd47cc9 by Michael Metternich at 2017-11-21T14:38:24+01:00
CHANNELMGR-1601 Also remove awcache and dll in non-skinny profile
- - - - -
0b2be5fe by Michael Metternich at 2017-11-21T14:40:35+01:00
CHANNELMGR-1601 Reintegrate feature/CHANNELMGR-1601
- - - - -
5de7eebf by Michael Metternich at 2017-11-21T14:43:43+01:00
CHANNELMGR-1488 Merge master in create-content
- - - - -
dddb3731 by Michael Metternich at 2017-11-21T14:44:51+01:00
CHANNELMGR-1488 Merge create-content in feature
- - - - -
2 changed files:
- frontend-ng/pom.xml
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.ts
Changes:
=====================================
frontend-ng/pom.xml
=====================================
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -71,12 +71,19 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ng-clean</id>
+ </execution>
+ </executions>
<configuration>
<filesets>
<fileset>
<directory>cache</directory>
<directory>coverage</directory>
<directory>node_modules</directory>
+ <directory>.awcache</directory>
+ <directory>dll</directory>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
@@ -84,4 +91,47 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>skinny</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${maven.plugin.exec.version}</version>
+ <executions>
+ <execution>
+ <id>npm-build</id>
+ <phase>process-resources</phase>
+ <goals><goal>exec</goal></goals>
+ <configuration>
+ <executable>npm</executable>
+ <commandlineArgs>run buildDev --
--transpileOnly</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ng-clean</id>
+ </execution>
+ </executions>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>cache</directory>
+ <directory>coverage</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
=====================================
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
@@ -157,7 +157,7 @@ export class CreateContentStep2Component implements OnInit {
private confirmDiscardChanges(): Promise<void> {
const messageParams = {
- // documentName: this.doc.displayName,
+ documentName: this.doc.displayName,
};
const confirm = this.dialogService.confirm()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/46a7a3bccdc76828aeca01f742bfaa4cb40aca64...dddb3731d662d5cc303d2f0c6fbeb143fc92729d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/46a7a3bccdc76828aeca01f742bfaa4cb40aca64...dddb3731d662d5cc303d2f0c6fbeb143fc92729d
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
