Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 14224: Replace AllowIssueNotes with AllowCheckoutNotes

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2017-02-02 11:37:54 +01:00 committed by Kyle M Hall
parent 88852ffbb0
commit c4dd097d20
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
installer/data/mysql/atomicupdate/bug_14224-issue_notes_syspref.sql
View file

@ -1 +1 @@
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');

2
installer/data/mysql/sysprefs.sql
View file

@ -22,7 +22,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('AllowHoldPolicyOverride','0',NULL,'Allow staff to override hold policies when placing holds','YesNo'),
('AllowHoldsOnDamagedItems','1','','Allow hold requests to be placed on damaged items','YesNo'),
('AllowHoldsOnPatronsPossessions','1',NULL,'Allow holds on records that patron have items of it','YesNo'),
('AllowIssueNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
('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'),
('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'),
('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
View file

@ -145,7 +145,7 @@ Circulation:
no: "Do not show"
- all items in the "Checked-in items" list, even items that were not checked out.
-
- pref: AllowIssueNotes
- pref: AllowCheckoutNotes
choices:
yes: Allow
no: "Don't allow"

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
View file

@ -26,7 +26,7 @@
<div class="span10">
<div id="issuenote" class="maincontent">
<h3>Editing issue note for [% title %] [% author %]</h3>
[% IF not(Koha.Preference("AllowIssueNotes")) %]
[% IF not(Koha.Preference("AllowCheckoutNotes")) %]
Issue notes have not been enabled. Please contact the library.
[% ELSE %]
<form id="issue-note" action="/cgi-bin/koha/opac-issue-note.pl" method="post">

6
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View file

@ -185,7 +185,7 @@ Using this account is not recommended because some parts of Koha will not functi
[% IF ( OPACMySummaryHTML ) %]
<th class="nosort">Links</th>
[% END %]
[% IF ( Koha.Preference('AllowIssueNotes') ) %]
[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
<th class="nosort">Note</th>
[% END %]
</tr>
@ -309,7 +309,7 @@ Using this account is not recommended because some parts of Koha will not functi
[% IF ( OPACMySummaryHTML ) %]
<td class="links">[% ISSUE.MySummaryHTML %]</td>
[% END %]
[% IF ( Koha.Preference('AllowIssueNotes') ) %]
[% 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>
@ -934,7 +934,7 @@ Using this account is not recommended because some parts of Koha will not functi
[% END %]
[% END %]
[% IF ( Koha.Preference('AllowIssueNotes') ) %]
[% 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();

2
opac/opac-issue-note.pl
View file

@ -63,7 +63,7 @@ $template->param(
);
my $action = $query->param('action') || "";
if ( $action eq 'issuenote' && C4::Context->preference('AllowIssueNotes') ) {
if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
my $note = $query->param('note');
my $scrubber = C4::Scrubber->new();
my $clean_note = $scrubber->scrub($note);

2
opac/svc/patron_notes
View file

@ -50,7 +50,7 @@ if ($is_ajax) {
my $action = $query->param('action');
# Issue Note
if ( $action eq 'issuenote' && C4::Context->preference('AllowIssueNotes') ) {
if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
my $scrubber = C4::Scrubber->new();
my $note = $query->param('note');
my $issue_id = $query->param('issue_id');