Attachment #62202 for bug #14224

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

(-)a/installer/data/mysql/atomicupdate/bug_14224-issue_notes_syspref.sql (-1 / +1 lines)

Line 1 Link Here

INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('AllowIssueNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo');

INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo');

Lines 22-28 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
22	('AllowHoldPolicyOverride','0',NULL,'Allow staff to override hold policies when placing holds','YesNo'),	22	('AllowHoldPolicyOverride','0',NULL,'Allow staff to override hold policies when placing holds','YesNo'),
23	('AllowHoldsOnDamagedItems','1','','Allow hold requests to be placed on damaged items','YesNo'),	23	('AllowHoldsOnDamagedItems','1','','Allow hold requests to be placed on damaged items','YesNo'),
24	('AllowHoldsOnPatronsPossessions','1',NULL,'Allow holds on records that patron have items of it','YesNo'),	24	('AllowHoldsOnPatronsPossessions','1',NULL,'Allow holds on records that patron have items of it','YesNo'),
25	('AllowIssueNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),	25	('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
26	('AllowItemsOnHoldCheckout','0','','Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),	26	('AllowItemsOnHoldCheckout','0','','Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
27	('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),	27	('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
28	('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),	28	('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),

Lines 145-151 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
145	no: "Do not show"	145	no: "Do not show"
146	- all items in the "Checked-in items" list, even items that were not checked out.	146	- all items in the "Checked-in items" list, even items that were not checked out.
147	-	147	-
148	- pref: AllowIssueNotes	148	- pref: AllowCheckoutNotes
149	choices:	149	choices:
150	yes: Allow	150	yes: Allow
151	no: "Don't allow"	151	no: "Don't allow"

Lines 26-32 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt (-1 / +1 lines)
26	<div class="span10">	26	<div class="span10">
27	<div id="issuenote" class="maincontent">	27	<div id="issuenote" class="maincontent">
28	<h3>Editing issue note for [% title %] [% author %]</h3>	28	<h3>Editing issue note for [% title %] [% author %]</h3>
29	[% IF not(Koha.Preference("AllowIssueNotes")) %]	29	[% IF not(Koha.Preference("AllowCheckoutNotes")) %]
30	Issue notes have not been enabled. Please contact the library.	30	Issue notes have not been enabled. Please contact the library.
31	[% ELSE %]	31	[% ELSE %]
32	<form id="issue-note" action="/cgi-bin/koha/opac-issue-note.pl" method="post">	32	<form id="issue-note" action="/cgi-bin/koha/opac-issue-note.pl" method="post">




                                                [% IF ( OPACMySummaryHTML ) %]
                                                    <th class="nosort">Links</th>
                                                [% END %]
                                                [% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
                                                    <th class="nosort">Note</th>
                                                [% END %]
                                            </tr>

                                                [% IF ( OPACMySummaryHTML ) %]
                                                    <td class="links">[% ISSUE.MySummaryHTML %]</td>
                                                [% END %]
                                                [% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
                                                    <td class="note">
                                                        <input type="text" name="note" data-issue_id="[% ISSUE.issue_id %]" data-origvalue="[% ISSUE.note %]" value="[% ISSUE.note %]" readonly>
                                                        <a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id %]" style="display:none;">Submit note</a>

                [% END %]
            [% END %]

            [% IF ( Koha.Preference('AllowCheckoutNotes') ) %]

                /* If JS enabled, show button, otherwise show link to redirect to a page where note can be submitted */
                $("a[name='nonjs_submitnote']").hide();

Lines 63-69 $template->param( Link Here

(-)a/opac/opac-issue-note.pl (-1 / +1 lines)
63	);	63	);
64		64
65	my $action = $query->param('action') \|\| "";	65	my $action = $query->param('action') \|\| "";
66	if ( $action eq 'issuenote' && C4::Context->preference('AllowIssueNotes') ) {	66	if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
67	my $note = $query->param('note');	67	my $note = $query->param('note');
68	my $scrubber = C4::Scrubber->new();	68	my $scrubber = C4::Scrubber->new();
69	my $clean_note = $scrubber->scrub($note);	69	my $clean_note = $scrubber->scrub($note);

Lines 50-56 if ($is_ajax) { Link Here

(-)a/opac/svc/patron_notes (-2 / +1 lines)
50	my $action = $query->param('action');	50	my $action = $query->param('action');
51		51
52	# Issue Note	52	# Issue Note
53	if ( $action eq 'issuenote' && C4::Context->preference('AllowIssueNotes') ) {	53	if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
54	my $scrubber = C4::Scrubber->new();	54	my $scrubber = C4::Scrubber->new();
55	my $note = $query->param('note');	55	my $note = $query->param('note');
56	my $issue_id = $query->param('issue_id');	56	my $issue_id = $query->param('issue_id');
57	-

Return to bug 14224

Lines 173-179 Using this account is not recommended because some parts of Koha will not functi Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +3 lines)
173	[% IF ( OPACMySummaryHTML ) %]	173	[% IF ( OPACMySummaryHTML ) %]
174	<th class="nosort">Links</th>	174	<th class="nosort">Links</th>
175	[% END %]	175	[% END %]
176	[% IF ( Koha.Preference('AllowIssueNotes') ) %]	176	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
177	<th class="nosort">Note</th>	177	<th class="nosort">Note</th>
178	[% END %]	178	[% END %]
179	</tr>	179	</tr>
Lines 295-301 Using this account is not recommended because some parts of Koha will not functi Link Here
295	[% IF ( OPACMySummaryHTML ) %]	295	[% IF ( OPACMySummaryHTML ) %]
296	<td class="links">[% ISSUE.MySummaryHTML %]</td>	296	<td class="links">[% ISSUE.MySummaryHTML %]</td>
297	[% END %]	297	[% END %]
298	[% IF ( Koha.Preference('AllowIssueNotes') ) %]	298	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
299	<td class="note">	299	<td class="note">
300	<input type="text" name="note" data-issue_id="[% ISSUE.issue_id %]" data-origvalue="[% ISSUE.note %]" value="[% ISSUE.note %]" readonly>	300	<input type="text" name="note" data-issue_id="[% ISSUE.issue_id %]" data-origvalue="[% ISSUE.note %]" value="[% ISSUE.note %]" readonly>
301	<a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id %]" style="display:none;">Submit note</a>	301	<a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id %]" style="display:none;">Submit note</a>
Lines 906-912 Using this account is not recommended because some parts of Koha will not functi Link Here
906	[% END %]	906	[% END %]
907	[% END %]	907	[% END %]
908		908
909	[% IF ( Koha.Preference('AllowIssueNotes') ) %]	909	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
910		910
911	/* If JS enabled, show button, otherwise show link to redirect to a page where note can be submitted */	911	/* If JS enabled, show button, otherwise show link to redirect to a page where note can be submitted */
912	$("a[name='nonjs_submitnote']").hide();	912	$("a[name='nonjs_submitnote']").hide();