Attachment #125788 for bug #29093

View | Details | Raw Unified | Return to bug 29093
Collapse All | Expand All

Lines 71-76 if ( $action eq 'create' ) { Link Here

(-)a/circ/request-article.pl (+2 lines)
71	my $chapters = $cgi->param('chapters') \|\| undef;	71	my $chapters = $cgi->param('chapters') \|\| undef;
72	my $patron_notes = $cgi->param('patron_notes') \|\| undef;	72	my $patron_notes = $cgi->param('patron_notes') \|\| undef;
73	my $format = $cgi->param('format') \|\| undef;	73	my $format = $cgi->param('format') \|\| undef;
		74	my $toc_request = $cgi->param('toc_request');
74		75
75	try {	76	try {
76	my $ar = Koha::ArticleRequest->new(	77	my $ar = Koha::ArticleRequest->new(
Lines 88-93 if ( $action eq 'create' ) { Link Here
88	chapters => $chapters,	89	chapters => $chapters,
89	patron_notes => $patron_notes,	90	patron_notes => $patron_notes,
90	format => $format,	91	format => $format,
		92	toc_request => $toc_request ? 1 : 0,
91	}	93	}
92	)->request;	94	)->request;
93	} catch {	95	} catch {

Lines 10-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc (+5 lines)
10	<th class="article-request-volume">Volume</th>	10	<th class="article-request-volume">Volume</th>
11	<th class="article-request-issue">Issue</th>	11	<th class="article-request-issue">Issue</th>
12	<th class="article-request-date">Date</th>	12	<th class="article-request-date">Date</th>
		13	<th class="article-request-toc">TOC</th>
13	<th class="article-request-pages">Pages</th>	14	<th class="article-request-pages">Pages</th>
14	<th class="article-request-chapters">Chapters</th>	15	<th class="article-request-chapters">Chapters</th>
15	<th class="article-request-notes">Notes</th>	16	<th class="article-request-notes">Notes</th>
Lines 55-60 Link Here
55	[% ar.date \| html %]	56	[% ar.date \| html %]
56	</td>	57	</td>
57		58
		59	<td class="article-request-toc">
		60	[% IF ar.toc_request %]Yes[% END %]
		61	</td>
		62
58	<td class="article-request-pages">	63	<td class="article-request-pages">
59	[% ar.pages \| html %]	64	[% ar.pages \| html %]
60	</td>	65	</td>

Lines 353-358 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (+2 lines)
353	</p>	353	</p>
354	</td>	354	</td>
355	<td class="ar-request">	355	<td class="ar-request">
		356	[% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %]
356	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]	357	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]
357	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]	358	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]
358	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]	359	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]
Lines 456-461 Link Here
456	</p>	457	</p>
457	</td>	458	</td>
458	<td class="ar-request">	459	<td class="ar-request">
		460	[% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %]
459	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]	461	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]
460	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]	462	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]
461	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]	463	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]

Lines 176-181 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (+7 lines)
176	<input type="text" name="date" id="date" size="50"/>	176	<input type="text" name="date" id="date" size="50"/>
177	</li>	177	</li>
178		178
		179	<li>
		180	<label for="toc_request">Table of contents:</label>
		181	<input type="checkbox" name="toc_request" value="1"/>
		182	</li>
		183
179	<li>	184	<li>
180	<label for="pages">Pages:</label>	185	<label for="pages">Pages:</label>
181	<input type="text" name="pages" id="pages" size="50"/>	186	<input type="text" name="pages" id="pages" size="50"/>
Lines 297-302 Link Here
297	<th>Volume</th>	302	<th>Volume</th>
298	<th>Issue</th>	303	<th>Issue</th>
299	<th>Date</th>	304	<th>Date</th>
		305	<th>TOC</th>
300	<th>Pages</th>	306	<th>Pages</th>
301	<th>Chapters</th>	307	<th>Chapters</th>
302	<th>Patron notes</th>	308	<th>Patron notes</th>
Lines 316-321 Link Here
316	<td>[% ar.volume \| html %]</td>	322	<td>[% ar.volume \| html %]</td>
317	<td>[% ar.issue \| html %]</td>	323	<td>[% ar.issue \| html %]</td>
318	<td>[% ar.date \| html %]</td>	324	<td>[% ar.date \| html %]</td>
		325	<td>[% IF ar.toc_request %]Yes[% END %]</td>
319	<td>[% ar.pages \| html %]</td>	326	<td>[% ar.pages \| html %]</td>
320	<td>[% ar.chapters \| html %]</td>	327	<td>[% ar.chapters \| html %]</td>
321	<td>[% ar.patron_notes \| html %]</td>	328	<td>[% ar.patron_notes \| html %]</td>

Lines 106-111 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt (+5 lines)
106	[% END %]	106	[% END %]
107	</li>	107	</li>
108		108
		109	<li>
		110	<label for="toc_request">Table of contents:</label>
		111	<input type="checkbox" name="toc_request" value="1"/>
		112	</li>
		113
109	<li>	114	<li>
110	[% IF mandatory_fields.search('pages') %]	115	[% IF mandatory_fields.search('pages') %]
111	<label for="pages" class="required">Pages:</label>	116	<label for="pages" class="required">Pages:</label>

Lines 777-782 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+5 lines)
777	<th class="article-request-volume">Volume</th>	777	<th class="article-request-volume">Volume</th>
778	<th class="article-request-issue">Issue</th>	778	<th class="article-request-issue">Issue</th>
779	<th class="article-request-date">Date</th>	779	<th class="article-request-date">Date</th>
		780	<th class="article-request-toc">TOC</th>
780	<th class="article-request-pages">Pages</th>	781	<th class="article-request-pages">Pages</th>
781	<th class="article-request-chapters">Chapters</th>	782	<th class="article-request-chapters">Chapters</th>
782	<th class="article-request-patron-notes">Notes</th>	783	<th class="article-request-patron-notes">Notes</th>
Lines 822-827 Link Here
822	[% ar.date \| html %]	823	[% ar.date \| html %]
823	</td>	824	</td>
824		825
		826	<td class="article-request-toc">
		827	[% IF ar.toc_request %]Yes[% END %]
		828	</td>
		829
825	<td class="article-request-pages">	830	<td class="article-request-pages">
826	[% ar.pages \| html %]	831	[% ar.pages \| html %]
827	</td>	832	</td>

Lines 62-67 if ( $action eq 'create' ) { Link Here

(-)a/opac/opac-request-article.pl (-1 / +2 lines)
62	my $chapters = $cgi->param('chapters') \|\| undef;	62	my $chapters = $cgi->param('chapters') \|\| undef;
63	my $patron_notes = $cgi->param('patron_notes') \|\| undef;	63	my $patron_notes = $cgi->param('patron_notes') \|\| undef;
64	my $format = $cgi->param('format') \|\| undef;	64	my $format = $cgi->param('format') \|\| undef;
		65	my $toc_request = $cgi->param('toc_request');
65		66
66		67
67	my $success;	68	my $success;
Lines 82-87 if ( $action eq 'create' ) { Link Here
82	chapters => $chapters,	83	chapters => $chapters,
83	patron_notes => $patron_notes,	84	patron_notes => $patron_notes,
84	format => $format,	85	format => $format,
		86	toc_request => $toc_request ? 1 : 0,
85	}	87	}
86	)->request;	88	)->request;
87	$success = 1;	89	$success = 1;
88	-

Return to bug 29093