From d6a7c9b487704583ba0f8e773c9de49407e89bcf Mon Sep 17 00:00:00 2001
From: Antoniafriedrich <antonia.friedrich@uni-jena.de>
Date: Tue, 5 Nov 2024 12:04:31 +0100
Subject: [PATCH 1/2] MIR-1366 fix npath to make keywords and geographic place
 visible in admin editor

---
 .../META-INF/resources/editor/editor-includes.xed         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index b80025a803..ab4c689115 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -1612,11 +1612,11 @@
   </xed:template>
 
   <xed:template id="geographic">
-    <mir:geographic.repeated path="mods:subject[not(mods:topic)]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" />
+    <mir:geographic.repeated path="mods:subject[mods:geographic]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" />
   </xed:template>
 
   <xed:template id="geographic.complex">
-    <mir:geographic.repeated path="mods:subject[not(mods:topic)]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" extended="true" />
+    <mir:geographic.repeated path="mods:subject[mods:geographic]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" extended="true" />
   </xed:template>
 
   <xed:template id="geographic.input">
@@ -1858,7 +1858,7 @@
   </xed:template>
 
   <xed:template id="subject.complex">
-    <xed:repeat xpath="mods:subject[not(mods:geographic)]" min="1" max="20">
+    <xed:repeat xpath="mods:subject[mods:topic]" min="1" max="20">
       <fieldset>
         <div class="row mir-fieldset-legend">
           <legend class="col-md-9" style="margin-bottom:0px;padding-top:10px;">
@@ -1874,7 +1874,7 @@
   </xed:template>
 
   <xed:template id="subject.complex.required">
-    <xed:repeat xpath="mods:subject[not(mods:geographic)]" min="1" max="20">
+    <xed:repeat xpath="mods:subject[mods:topic]" min="1" max="20">
       <fieldset>
         <div class="row mir-fieldset-legend">
           <legend class="col-md-9" style="margin-bottom:0px;padding-top:10px;">

From 4756bc50bb1e91590f3fa92933078b185db8a5c9 Mon Sep 17 00:00:00 2001
From: Antoniafriedrich <antonia.friedrich@uni-jena.de>
Date: Mon, 2 Dec 2024 11:01:28 +0100
Subject: [PATCH 2/2] MIR-1366 simplify path

---
 .../resources/META-INF/resources/editor/editor-includes.xed   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index ab4c689115..ab2207b1a8 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -1612,11 +1612,11 @@
   </xed:template>
 
   <xed:template id="geographic">
-    <mir:geographic.repeated path="mods:subject[mods:geographic]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" />
+    <mir:geographic.repeated path="mods:subject/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" />
   </xed:template>
 
   <xed:template id="geographic.complex">
-    <mir:geographic.repeated path="mods:subject[mods:geographic]/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" extended="true" />
+    <mir:geographic.repeated path="mods:subject/mods:geographic" min="1" max="20" label="mir.geographic" help-text="{i18n:mir.help.cartographics.place}" extended="true" />
   </xed:template>
 
   <xed:template id="geographic.input">