Bugzilla – Attachment 148819 Details for
Bug 33346
Add Help link to Koha manual in ERM module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33346: Add Help link to Koha manual in ERM module
Bug-33346-Add-Help-link-to-Koha-manual-in-ERM-modu.patch (text/plain), 5.64 KB, created by
Martin Renvoize (ashimema)
on 2023-03-28 12:55:22 UTC
(
hide
)
Description:
Bug 33346: Add Help link to Koha manual in ERM module
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-03-28 12:55:22 UTC
Size:
5.64 KB
patch
obsolete
>From 1a92ef26609de2ff5952714745acd4343db8ee9f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 28 Mar 2023 10:11:01 +0200 >Subject: [PATCH] Bug 33346: Add Help link to Koha manual in ERM module > >The 'Help' is missing in the ERM module, this patch is adding it. > >Test plan: >Confirm that the Help link is displayed on the different pages of the >ERM module and that it leads to the correct page of the manual. > >Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/Manual.pm | 34 ++++++++++++++++++- > .../prog/js/vue/components/ERM/Main.vue | 7 +++- > .../prog/js/vue/components/Help.vue | 9 +++++ > 3 files changed, 48 insertions(+), 2 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/components/Help.vue > >diff --git a/Koha/Manual.pm b/Koha/Manual.pm >index bb052f1a2f..4ef8c09dcf 100644 >--- a/Koha/Manual.pm >+++ b/Koha/Manual.pm >@@ -150,6 +150,34 @@ our $mapping = { > 'course_reserves/course-details' => '/course_reserves.html', > 'course_reserves/course-reserves' => '/course_reserves.html', > 'course_reserves/course' => '/course_reserves.html#adding-courses', >+ 'erm/erm' => '/erm.html', >+ 'erm/agreements' => '/erm.html#agreements', >+ 'erm/agreements/' => '/erm.html#search-and-view-an-agreement-record', >+ 'erm/agreements/add' => '/erm.html#create-an-agreement-record', >+ 'erm/agreements/edit/' => '/erm.html#create-an-agreement-record', >+ 'erm/licenses' => '/erm.html#licenses', >+ 'erm/licenses/' => '/erm.html#search-and-view-a-license-record', >+ 'erm/licenses/add' => '/erm.html#create-a-license-record', >+ 'erm/licenses/edit' => '/erm.html#create-a-license-record', >+ 'erm/eholdings/local/packages' => '/erm.html#local', >+ 'erm/eholdings/local/packages/' => '/erm.html#local', >+ 'erm/eholdings/local/packages/add' => '/erm.html#local', >+ 'erm/eholdings/local/packages/edit/' => '/erm.html#local', >+ 'erm/eholdings/local/titles' => '/erm.html#titles-1', >+ 'erm/eholdings/local/titles/' => '/erm.html#titles-1', >+ 'erm/eholdings/local/titles/add' => '/erm.html#titles-1', >+ 'erm/eholdings/local/titles/edit/' => '/erm.html#titles-1', >+ 'erm/eholdings/local/titles/import' => '/erm.html#import-a-new-local-title-record-from-a-list', >+ 'erm/eholdings/local/resources/' => '/erm.html#eholdings', >+ 'erm/eholdings/ebsco/packages' => '/erm.html#packages', >+ 'erm/eholdings/ebsco/packages/' => '/erm.html#packages', >+ 'erm/eholdings/ebsco/packages/add' => '/erm.html#packages', >+ 'erm/eholdings/ebsco/packages/edit/' => '/erm.html#packages', >+ 'erm/eholdings/ebsco/titles' => '/erm.html#titles', >+ 'erm/eholdings/ebsco/titles/' => '/erm.html#titles', >+ 'erm/eholdings/ebsco/titles/add' => '/erm.html#titles', >+ 'erm/eholdings/ebsco/titles/edit/' => '/erm.html#titles', >+ 'erm/eholdings/ebsco/resources/' => '/erm.html#ebsco', > 'ill/ill-requests' => '/ILL_requests.html', > 'labels/label-edit-batch' => '/tools.html#label-batches-label', > 'labels/label-edit-layout' => '/tools.html#label-layouts-label', >@@ -254,13 +282,17 @@ our $mapping = { > sub get_url { > my ( $url, $preferred_language ) = @_; > my $file; >- if ($url =~ /koha\/(.*)\.pl/) { >+ if ($url =~ /koha\/(.*)\.pl/ || $url =~ '/koha/(erm.*)') { > $file = $1; > } else { > $file = 'mainpage'; > } > $file =~ s/[^a-zA-Z0-9_\-\/]*//g; > >+ if ( $file =~ m|^erm| ) { >+ $file =~ s|\d*$||; >+ } >+ > my $view; > if ($url =~ /(?:\?|\&)tab=(?<value>[\w+,.-]*)/) { > $view = $file . '#' . $+{value}; >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >index 0da4384934..ae4b5b56a5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >@@ -1,6 +1,9 @@ > <template> > <div v-if="ERMModule"> >- <Breadcrumb /> >+ <div id="sub-header"> >+ <Breadcrumb /> >+ <Help /> >+ </div> > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >@@ -117,6 +120,7 @@ > <script> > import { inject } from "vue" > import Breadcrumb from "../../components/Breadcrumb.vue" >+import Help from "../../components/Help.vue" > import Dialog from "../../components/Dialog.vue" > import { APIClient } from "../../fetch/api-client.js" > import "vue-select/dist/vue-select.css" >@@ -205,6 +209,7 @@ export default { > components: { > Breadcrumb, > Dialog, >+ Help, > }, > } > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Help.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Help.vue >new file mode 100644 >index 0000000000..246db0c745 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Help.vue >@@ -0,0 +1,9 @@ >+<template> >+ <nav id="shortcut" class="shortcut"> >+ <a href="/cgi-bin/koha/help.pl" >+ ><i class="fa fa-question-circle"></i> <span>Help</span></a >+ > >+ </nav> >+</template> >+ >+<script></script> >-- >2.40.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33346
:
148794
|
148807
|
148808
| 148819 |
148820