[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-460] CHANNELMGR-460 Use url from ChannelService to setup internal link processor
Arthur Bogaart pushed to branch feature/cmng-psp1-CHANNELMGR-460 at
cms-community / hippo-addon-channel-manager
Commits:
086ea9b0 by Arthur Bogaart at 2016-02-27T00:26:14+01:00
CHANNELMGR-460 Use url from ChannelService to setup internal link processor
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -14,18 +14,6 @@
* limitations under the License.
*/
-function constructUrl(location, ...fragments) {
- let url = `${location.protocol}//${location.host}`;
- fragments.forEach((fragment) => {
-if (angular.isString(fragment) && fragment.length) {
- const urlAndSlash = url.charAt(url.length - 1) === '/' ? url : `${url}/`;
- const noSlashAndFragment = fragment.charAt(0) === '/' ?
fragment.substring(1) : fragment;
- url = urlAndSlash + noSlashAndFragment;
-}
- });
- return url;
-}
-
export class HippoIframeCtrl {
constructor($rootScope, $element, linkProcessorService,
hstCommentsProcessorService, ChannelService,
PageStructureService, OverlaySyncService) {
@@ -69,8 +57,7 @@ export class HippoIframeCtrl {
_parseLinks() {
const iframeDom = this.iframeJQueryElement.contents()[0];
-const channel = this.ChannelService.channel;
-const internalLinkPrefix = constructUrl(iframeDom.location,
channel.contextPath, channel.cmsPreviewPrefix);
+const internalLinkPrefix =
`${iframeDom.location.protocol}//${iframeDom.location.host}${this.ChannelService.getUrl()}`;
this.linkProcessorService.run(iframeDom, internalLinkPrefix);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/086ea9b0564e3ab6204047cb107b4192e87281c3
___
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/cmng-psp1-CHANNELMGR-460
Arthur Bogaart pushed new branch feature/cmng-psp1-CHANNELMGR-460 at cms-community / hippo-addon-channel-manager ___ 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][feature/translations-psp1] HIPPLUG-1269 - fix TaxonomyVisitor taxonomy repository model processing
Ate Douma pushed to branch feature/translations-psp1 at cms-community /
hippo-plugin-taxonomy
Commits:
e31fe9e3 by Ate Douma at 2016-02-26T16:13:30+01:00
HIPPLUG-1269 - fix TaxonomyVisitor taxonomy repository model processing
- - - - -
1 changed file:
-
hst/src/main/java/org/onehippo/taxonomy/restapi/content/HippoTaxonomyVisitor.java
Changes:
=
hst/src/main/java/org/onehippo/taxonomy/restapi/content/HippoTaxonomyVisitor.java
=
---
a/hst/src/main/java/org/onehippo/taxonomy/restapi/content/HippoTaxonomyVisitor.java
+++
b/hst/src/main/java/org/onehippo/taxonomy/restapi/content/HippoTaxonomyVisitor.java
@@ -77,13 +77,13 @@ public class HippoTaxonomyVisitor extends
HippoPublicationWorkflowDocumentVisito
for (Node locale : new NodeIterable(child.getNodes())) {
final LinkedHashMap localeProperties = new
LinkedHashMap<>();
category.put(locale.getName(), localeProperties);
-localeProperties.put("message",
child.getProperty(HIPPOTAXONOMY_MESSAGE).getString());
-if (child.hasProperty(HIPPOTAXONOMY_DESCRIPTION)) {
-localeProperties.put("description",
child.getProperty(HIPPOTAXONOMY_DESCRIPTION).getString());
+localeProperties.put("message",
locale.getProperty(HIPPOTAXONOMY_MESSAGE).getString());
+if (locale.hasProperty(HIPPOTAXONOMY_DESCRIPTION)) {
+localeProperties.put("description",
locale.getProperty(HIPPOTAXONOMY_DESCRIPTION).getString());
}
-if (child.hasProperty(HIPPOTAXONOMY_SYNONYMS)) {
+if (locale.hasProperty(HIPPOTAXONOMY_SYNONYMS)) {
final ArrayList synonyms = new ArrayList<>();
-for (Value value :
child.getProperty(HIPPOTAXONOMY_SYNONYMS).getValues()) {
+for (Value value :
locale.getProperty(HIPPOTAXONOMY_SYNONYMS).getValues()) {
if (value.getString() != null) {
synonyms.add(value.getString());
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/e31fe9e3dabe16af6d576975b3fba53fbc14403b
___
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][feature/translations-psp1] HIPPLUG-1269 - fix taxonomy test bootstrap configuration
Ate Douma pushed to branch feature/translations-psp1 at cms-community /
hippo-plugin-taxonomy
Commits:
17993f6c by Ate Douma at 2016-02-26T16:12:24+01:00
HIPPLUG-1269 - fix taxonomy test bootstrap configuration
- - - - -
1 changed file:
-
addon/frontend/src/test/java/org/onehippo/taxonomy/plugin/AbstractTaxonomyTest.java
Changes:
=
addon/frontend/src/test/java/org/onehippo/taxonomy/plugin/AbstractTaxonomyTest.java
=
---
a/addon/frontend/src/test/java/org/onehippo/taxonomy/plugin/AbstractTaxonomyTest.java
+++
b/addon/frontend/src/test/java/org/onehippo/taxonomy/plugin/AbstractTaxonomyTest.java
@@ -34,6 +34,7 @@ import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_KEY;
import static org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_LOCALE;
import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_LOCALES;
import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_LOCALIZED;
+import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_MESSAGE;
import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.HIPPOTAXONOMY_SYNONYMS;
import static
org.onehippo.taxonomy.api.TaxonomyNodeTypes.NODETYPE_HIPPOTAXONOMY_CATEGORY;
@@ -66,7 +67,7 @@ public abstract class AbstractTaxonomyTest extends PluginTest
{
HIPPOTAXONOMY_KEY, BRANCH_KEY,
"/test/taxonomy/top/branch/" +
HIPPOTAXONOMY_LOCALES, HIPPOTAXONOMY_LOCALES,
"/test/taxonomy/top/branch/" +
HIPPOTAXONOMY_LOCALES + "/en", HIPPOTAXONOMY_LOCALE,
-"hippo:message", BRANCH_NAME_EN,
+HIPPOTAXONOMY_MESSAGE, BRANCH_NAME_EN,
HIPPOTAXONOMY_SYNONYMS, BRANCH_SYNONYM,
};
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/17993f6cca528d6c10098f2dfc458d30d4bbb6a2
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
