Attachment #125290 for bug #29093

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

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

(-)a/circ/request-article.pl (+2 lines)
67	my $chapters = $cgi->param('chapters') \|\| undef;	67	my $chapters = $cgi->param('chapters') \|\| undef;
68	my $patron_notes = $cgi->param('patron_notes') \|\| undef;	68	my $patron_notes = $cgi->param('patron_notes') \|\| undef;
69	my $format = $cgi->param('format') \|\| undef;	69	my $format = $cgi->param('format') \|\| undef;
		70	my $toc_request = $cgi->param('toc_request');
70		71
71	my $ar = Koha::ArticleRequest->new(	72	my $ar = Koha::ArticleRequest->new(
72	{	73	{
Lines 83-88 if ( $action eq 'create' ) { Link Here
83	chapters => $chapters,	84	chapters => $chapters,
84	patron_notes => $patron_notes,	85	patron_notes => $patron_notes,
85	format => $format,	86	format => $format,
		87	toc_request => $toc_request ? 1 : 0,
86	}	88	}
87	)->store();	89	)->store();
88		90

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 196-201 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (+2 lines)
196	</p>	196	</p>
197	</td>	197	</td>
198	<td class="ar-request">	198	<td class="ar-request">
		199	[% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %]
199	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]	200	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]
200	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]	201	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]
201	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]	202	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]
Lines 299-304 Link Here
299	</p>	300	</p>
300	</td>	301	</td>
301	<td class="ar-request">	302	<td class="ar-request">
		303	[% IF ar.toc_request %] <p><strong>Include TOC</strong> </p> [% END %]
302	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]	304	[% IF ar.title %] <p><strong>Title:</strong> [% ar.title \| html %] </p> [% END %]
303	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]	305	[% IF ar.author %] <p><strong>Author:</strong> [% ar.author \| html %] </p> [% END %]
304	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]	306	[% IF ar.volume %] <p><strong>Volume:</strong> [% ar.volume \| html %] </p> [% END %]

Lines 128-133 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (+7 lines)
128	<input type="text" name="date" id="date" size="50"/>	128	<input type="text" name="date" id="date" size="50"/>
129	</li>	129	</li>
130		130
		131	<li>
		132	<label for="toc_request">Table of contents:</label>
		133	<input type="checkbox" name="toc_request" value="1"/>
		134	</li>
		135
131	<li>	136	<li>
132	<label for="pages">Pages:</label>	137	<label for="pages">Pages:</label>
133	<input type="text" name="pages" id="pages" size="50"/>	138	<input type="text" name="pages" id="pages" size="50"/>
Lines 249-254 Link Here
249	<th>Volume</th>	254	<th>Volume</th>
250	<th>Issue</th>	255	<th>Issue</th>
251	<th>Date</th>	256	<th>Date</th>
		257	<th>TOC</th>
252	<th>Pages</th>	258	<th>Pages</th>
253	<th>Chapters</th>	259	<th>Chapters</th>
254	<th>Patron notes</th>	260	<th>Patron notes</th>
Lines 268-273 Link Here
268	<td>[% ar.volume \| html %]</td>	274	<td>[% ar.volume \| html %]</td>
269	<td>[% ar.issue \| html %]</td>	275	<td>[% ar.issue \| html %]</td>
270	<td>[% ar.date \| html %]</td>	276	<td>[% ar.date \| html %]</td>
		277	<td>[% IF ar.toc_request %]Yes[% END %]</td>
271	<td>[% ar.pages \| html %]</td>	278	<td>[% ar.pages \| html %]</td>
272	<td>[% ar.chapters \| html %]</td>	279	<td>[% ar.chapters \| html %]</td>
273	<td>[% ar.patron_notes \| html %]</td>	280	<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 725-730 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+5 lines)
725	<th class="article-request-volume">Volume</th>	725	<th class="article-request-volume">Volume</th>
726	<th class="article-request-issue">Issue</th>	726	<th class="article-request-issue">Issue</th>
727	<th class="article-request-date">Date</th>	727	<th class="article-request-date">Date</th>
		728	<th class="article-request-toc">TOC</th>
728	<th class="article-request-pages">Pages</th>	729	<th class="article-request-pages">Pages</th>
729	<th class="article-request-chapters">Chapters</th>	730	<th class="article-request-chapters">Chapters</th>
730	<th class="article-request-patron-notes">Notes</th>	731	<th class="article-request-patron-notes">Notes</th>
Lines 770-775 Link Here
770	[% ar.date \| html %]	771	[% ar.date \| html %]
771	</td>	772	</td>
772		773
		774	<td class="article-request-toc">
		775	[% IF ar.toc_request %]Yes[% END %]
		776	</td>
		777
773	<td class="article-request-pages">	778	<td class="article-request-pages">
774	[% ar.pages \| html %]	779	[% ar.pages \| html %]
775	</td>	780	</td>

Lines 58-63 if ( $action eq 'create' ) { Link Here

(-)a/opac/opac-request-article.pl (-1 / +2 lines)
58	my $chapters = $cgi->param('chapters') \|\| undef;	58	my $chapters = $cgi->param('chapters') \|\| undef;
59	my $patron_notes = $cgi->param('patron_notes') \|\| undef;	59	my $patron_notes = $cgi->param('patron_notes') \|\| undef;
60	my $format = $cgi->param('format') \|\| undef;	60	my $format = $cgi->param('format') \|\| undef;
		61	my $toc_request = $cgi->param('toc_request');
61		62
62	my $ar = Koha::ArticleRequest->new(	63	my $ar = Koha::ArticleRequest->new(
63	{	64	{
Lines 74-79 if ( $action eq 'create' ) { Link Here
74	chapters => $chapters,	75	chapters => $chapters,
75	patron_notes => $patron_notes,	76	patron_notes => $patron_notes,
76	format => $format,	77	format => $format,
		78	toc_request => $toc_request ? 1 : 0,
77	}	79	}
78	)->store();	80	)->store();
79		81
80	-

Return to bug 29093