Attachment 125290 Details for Bug 29093 – Bug 29093: Interface changes

[patch] Bug 29093: Interface changes

Bug-29093-Interface-changes.patch (text/plain), 9.83 KB, created by David Nind on 2021-09-24 16:45:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2021-09-24 16:45:14 UTC

Size: 9.83 KB

patch

obsolete

>From 3fb448a5fa1d4e20b4c95fa9fa711954d16c95e1 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 23 Sep 2021 13:23:44 +0000
>Subject: [PATCH] Bug 29093: Interface changes
>
>Show the TOC checkbox on OPAC and staff.
>
>Test plan:
>Add new article request on OPAC or staff. Tick checkbox.
>Verify if TOC is Yes on opac-user or staff patron details.
>Check the list view on circ/article-requests.pl.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> circ/request-article.pl | 2 ++
> .../prog/en/includes/patron-article-requests.inc | 5 +++++
> .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 2 ++
> .../intranet-tmpl/prog/en/modules/circ/request-article.tt | 7 +++++++
> .../opac-tmpl/bootstrap/en/modules/opac-request-article.tt | 5 +++++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 5 +++++
> opac/opac-request-article.pl | 2 ++
> 7 files changed, 28 insertions(+)
>
>diff --git a/circ/request-article.pl b/circ/request-article.pl
>index 678c4c9694..8e33dcbf30 100755
>--- a/circ/request-article.pl
>+++ b/circ/request-article.pl
>@@ -67,6 +67,7 @@ if ( $action eq 'create' ) {
> my $chapters = $cgi->param('chapters') || undef;
> my $patron_notes = $cgi->param('patron_notes') || undef;
> my $format = $cgi->param('format') || undef;
>+ my $toc_request = $cgi->param('toc_request');
> 
> my $ar = Koha::ArticleRequest->new(
> {
>@@ -83,6 +84,7 @@ if ( $action eq 'create' ) {
> chapters => $chapters,
> patron_notes => $patron_notes,
> format => $format,
>+ toc_request => $toc_request ? 1 : 0,
> }
> )->store();
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>index b2a25a0580..f3ab76e62c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>@@ -10,6 +10,7 @@
> <th class="article-request-volume">Volume</th>
> <th class="article-request-issue">Issue</th>
> <th class="article-request-date">Date</th>
>+ <th class="article-request-toc">TOC</th>
> <th class="article-request-pages">Pages</th>
> <th class="article-request-chapters">Chapters</th>
> <th class="article-request-notes">Notes</th>
>@@ -55,6 +56,10 @@
> [% ar.date | html %]
> </td>
> 
>+ <td class="article-request-toc">
>+ [% IF ar.toc_request %]Yes[% END %]
>+ </td>
>+
> <td class="article-request-pages">
> [% ar.pages | html %]
> </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>index 61e94ca026..5a448a7e05 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>@@ -196,6 +196,7 @@
> 
> </td>
> <td class="ar-request">
>+ [% IF ar.toc_request %] Include TOC [% END %]
> [% IF ar.title %] Title: [% ar.title | html %] [% END %]
> [% IF ar.author %] Author: [% ar.author | html %] [% END %]
> [% IF ar.volume %] Volume: [% ar.volume | html %] [% END %]
>@@ -299,6 +300,7 @@
> 
> </td>
> <td class="ar-request">
>+ [% IF ar.toc_request %] Include TOC [% END %]
> [% IF ar.title %] Title: [% ar.title | html %] [% END %]
> [% IF ar.author %] Author: [% ar.author | html %] [% END %]
> [% IF ar.volume %] Volume: [% ar.volume | html %] [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>index 9206dba4e2..7895d0db4e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>@@ -128,6 +128,11 @@
> <input type="text" name="date" id="date" size="50"/>
> </li>
> 
>+ <li>
>+ <label for="toc_request">Table of contents:</label>
>+ <input type="checkbox" name="toc_request" value="1"/>
>+ </li>
>+
> <li>
> <label for="pages">Pages:</label>
> <input type="text" name="pages" id="pages" size="50"/>
>@@ -249,6 +254,7 @@
> <th>Volume</th>
> <th>Issue</th>
> <th>Date</th>
>+ <th>TOC</th>
> <th>Pages</th>
> <th>Chapters</th>
> <th>Patron notes</th>
>@@ -268,6 +274,7 @@
> <td>[% ar.volume | html %]</td>
> <td>[% ar.issue | html %]</td>
> <td>[% ar.date | html %]</td>
>+ <td>[% IF ar.toc_request %]Yes[% END %]</td>
> <td>[% ar.pages | html %]</td>
> <td>[% ar.chapters | html %]</td>
> <td>[% ar.patron_notes | html %]</td>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>index f33c470e87..85995d0b9b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>@@ -106,6 +106,11 @@
> [% END %]
> </li>
> 
>+ <li>
>+ <label for="toc_request">Table of contents:</label>
>+ <input type="checkbox" name="toc_request" value="1"/>
>+ </li>
>+
> <li>
> [% IF mandatory_fields.search('pages') %]
> <label for="pages" class="required">Pages:</label>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 7c92ba2f9e..969a5fbed5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -725,6 +725,7 @@
> <th class="article-request-volume">Volume</th>
> <th class="article-request-issue">Issue</th>
> <th class="article-request-date">Date</th>
>+ <th class="article-request-toc">TOC</th>
> <th class="article-request-pages">Pages</th>
> <th class="article-request-chapters">Chapters</th>
> <th class="article-request-patron-notes">Notes</th>
>@@ -770,6 +771,10 @@
> [% ar.date | html %]
> </td>
> 
>+ <td class="article-request-toc">
>+ [% IF ar.toc_request %]Yes[% END %]
>+ </td>
>+
> <td class="article-request-pages">
> [% ar.pages | html %]
> </td>
>diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl
>index dd02b4d7b9..f30ba0a6ed 100755
>--- a/opac/opac-request-article.pl
>+++ b/opac/opac-request-article.pl
>@@ -58,6 +58,7 @@ if ( $action eq 'create' ) {
> my $chapters = $cgi->param('chapters') || undef;
> my $patron_notes = $cgi->param('patron_notes') || undef;
> my $format = $cgi->param('format') || undef;
>+ my $toc_request = $cgi->param('toc_request');
> 
> my $ar = Koha::ArticleRequest->new(
> {
>@@ -74,6 +75,7 @@ if ( $action eq 'create' ) {
> chapters => $chapters,
> patron_notes => $patron_notes,
> format => $format,
>+ toc_request => $toc_request ? 1 : 0,
> }
> )->store();
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29093: 125190 | 125191 | 125192 | 125288 | 125289 | 125290 | 125448 | 125449 | 125450 | 125772 | 125773 | 125774 | 125775 | 125787 | 125788 | 125789 | 125790 | 125791 | 125792