MIR-1420 use new processing ui (#1101)

* remove old processingGUI.xsl references * remove rules to protect xsl website * fix link
MyCoRe-Org · Jan 15, 2025 · 161fb6d · 161fb6d
1 parent eb2061a
commit 161fb6d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/mir-cli/src/main/config/acl/webacl-commands.txt b/mir-cli/src/main/config/acl/webacl-commands.txt
@@ -18,7 +18,6 @@ update permission write for id webpage:/modules/wcms2/wcms2.xml?XSL.useMT=false
 update permission read for id webpage:/content/publish/importPPN.xml with rulefile ${app.home}/config/acl/grant-editors.xml described by ${acl-description.editors}
 update permission read for id webpage:/modules/webcli/launchpad.xml with rulefile ${app.home}/config/acl/grant-admin.xml described by ${acl-description.admins}
 update permission read for id webpage:/modules/webtools/session/sessionListing.xml with rulefile ${app.home}/config/acl/grant-admin.xml described by ${acl-description.admins}
-update permission read for id webpage:/modules/webtools/processing/processing.xml with rulefile ${app.home}/config/acl/grant-admin.xml described by ${acl-description.admins}
 update permission read for id webpage:/authorization/change-password.xed with rulefile ${app.home}/config/acl/grant-admin.xml described by ${acl-description.admins}
 update permission read for id webpage:/authorization/change-password.xed?action=password with rulefile ${app.home}/config/acl/require-login.xml described by ${acl-description.require-login}
 update permission read for id webpage:/servlets/MCRUserServlet?action=show with rulefile ${app.home}/config/acl/require-login.xml described by ${acl-description.require-login}

diff --git a/mir-module/src/main/resources/META-INF/resources/config/navigation.xml b/mir-module/src/main/resources/META-INF/resources/config/navigation.xml
@@ -144,7 +144,7 @@
         <label xml:lang="de">Aktive Sitzungen</label>
         <label xml:lang="en">Session Management</label>
       </item>
-      <item href="/modules/webtools/processing/processing.xml" type="intern">
+      <item href="/modules/webtools/processing" type="intern">
         <label xml:lang="de">Aktive Prozesse</label>
         <label xml:lang="en">Processing</label>
       </item>

diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -45,7 +45,7 @@ MCR.LayoutService.TransformerFactoryClass=%XALAN%
 MCR.Layout.Transformer.Factory.XSLFolder=xsl
 
 #mir-module migration to Saxon
-MCR.URIResolver.xslIncludes.components=resource:xsl/mcr-module-startIview2.xsl,resource:xsl/sessionListing.xsl,resource:xsl/processingGUI.xsl,resource:xsl/altoChanges.xsl
+MCR.URIResolver.xslIncludes.components=resource:xsl/mcr-module-startIview2.xsl,resource:xsl/sessionListing.xsl,resource:xsl/altoChanges.xsl
 MCR.ContentTransformer.mcr_error.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
 MCR.ContentTransformer.mcr_error.Stylesheet=xsl/mcr_error.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
 MCR.ContentTransformer.MyCoReWebPage.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl

diff --git a/mir-module/src/main/resources/rules/rules-processing.xml b/mir-module/src/main/resources/rules/rules-processing.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <or xmlns:rh="https://mycore.org/rule-helper">
     <and>
-        <or>
-            <action>use-processable</action>
-            <!-- manage sessions page -->
-            <and>
-                <target>webpage</target>
-                <id>webpage:/modules/webtools/processing/processing.xml</id>
-            </and>
-        </or>
+        <action>use-processable</action>
         <role>admin</role>
     </and>
 </or>
-
diff --git a/mir-wizard/src/main/resources/setup/webacl-wizard-commands.xml b/mir-wizard/src/main/resources/setup/webacl-wizard-commands.xml
@@ -105,11 +105,6 @@
     webpage:/modules/webtools/session/sessionListing.xml with
     rule {file} described by {describedBy}
   </command>
-  <command file="resource:setup/acl/grant-admin.xml" describedBy="administrators only">
-    update permission read for id
-    webpage:/modules/webtools/processing/processing.xml with
-    rule {file} described by {describedBy}
-  </command>
   <command file="resource:setup/acl/grant-admin.xml" describedBy="administrators only">
     update permission read for id
     webpage:/authorization/change-password.xed with
@@ -135,4 +130,4 @@
     webpage:/servlets/solr/select?q=createdby:{CurrentUser}&amp;fq=objectType:mods with
     rule {file} described by {describedBy}
   </command>
-</commands>
+</commands>