diff --git a/core/src/main/java/org/fao/geonet/kernel/XmlSerializer.java b/core/src/main/java/org/fao/geonet/kernel/XmlSerializer.java index e588ba3016b..cbbe4256987 100644 --- a/core/src/main/java/org/fao/geonet/kernel/XmlSerializer.java +++ b/core/src/main/java/org/fao/geonet/kernel/XmlSerializer.java @@ -184,6 +184,9 @@ private void xpath(StringBuilder buffer, Element next) { public static void removeFilteredElement(Element metadata, final Pair xPathAndMarkedElement, List namespaces) throws JDOMException { + // xPathAndMarkedElement seem can be null in some schemas like dublin core + if (xPathAndMarkedElement == null) return; + String xpath = xPathAndMarkedElement.one(); Element mark = xPathAndMarkedElement.two(); diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js index 9438a693152..20184248a86 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js @@ -306,6 +306,8 @@ gnOnlinesrc.register('onlinesrc', function() { scope.metadataId = gnCurrentEdit.id; + scope.schema = gnCurrentEdit.schema; + $(scope.popupid).modal('show'); }); diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js index 542c6799367..f9cb9162905 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js @@ -219,8 +219,8 @@ * * @param {string} type of the directive that calls it. */ - onOpenPopup: function(type) { - openCb[type](); + onOpenPopup: function(type, additionalParams) { + openCb[type](additionalParams); }, /** diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html index c8420a5f688..d025bf8b76a 100644 --- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html +++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html @@ -20,7 +20,7 @@
-
@@ -59,7 +59,7 @@ -
+
-
+
@@ -78,7 +78,7 @@
-
+