Merge remote-tracking branch 'origin/3.2.x' into 3.2.x

geonetwork · Feb 10, 2017 · 6d102d5 · 6d102d5
2 parents 54be6ac + 6b3b04f
commit 6d102d5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml b/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
@@ -370,8 +370,8 @@
 
   <!-- View configuration -->
   <views>
-    <!--Turn off INSPIRE view by default -->
-    <view name="inspire" upAndDownControlHidden="true" disabled="true">
+    <!--Turn on INSPIRE according to system settings -->
+    <view name="inspire" upAndDownControlHidden="true" displayIfServiceInfo="/settings/system/inspire/enable='true'">
       <tab id="inspire" default="true" mode="flat">
         <section name="resource">
           <field