Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MIR-1420 use new processing ui #1101

Merged
merged 1 commit into from
Jan 15, 2025
Merged

MIR-1420 use new processing ui #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mir-cli/src/main/config/acl/webacl-commands.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion mir-module/src/main/resources/META-INF/resources/config/navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion mir-module/src/main/resources/config/mir/mycore.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions mir-module/src/main/resources/rules/rules-processing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

7 changes: 1 addition & 6 deletions mir-wizard/src/main/resources/setup/webacl-wizard-commands.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -135,4 +130,4 @@
webpage:/servlets/solr/select?q=createdby:{CurrentUser}&amp;fq=objectType:mods with
rule {file} described by {describedBy}
</command>
</commands>
</commands>
Loading