Jonathan Druart
286be46e8a
The C4::Members::GetBorrowersWithIssuesHistoryOlderThan subroutine is supposed to return the patrons with an issue history older than a given date. It would make more sense to return a list of Koha::Patrons. On the way, the code from AnonymiseIssueHistory will be moved as well to anonymise_issue_history. Note that these 2 subroutines are strongly linked: one is used to know the number of patrons we will anonymise the history, the other one is used to anonymise the issues history. The problem is that the first one is not used to do the action, but only for displayed purpose. In some cases, these 2 values can differ, which could be confusing. Case 1: The logged in librarian is not superlibrarian and IndependentBranches is set: if 2+ patrons from different libraries match the date parameter, the interface will display "Checkout history for 2 patrons will be anonymized", when actually only 1 will be. Case 2: If 2+ patrons match the date parameter but one of them has his privacy set to forever (privacy=0), the same issue will appear. This patch moves the code from C4::Members::GetBorrowersWithIssuesHistoryOlderThan to Koha::Patrons->search_patrons_to_anonymise and from C4::Circulation::AnonymiseIssueHistory to Koha::Patrons->anonymise_issue_history Test plan: 1/ Confirm the 2 issues and make sure they are fixed using the Batch patron anonymization tool (tools/cleanborrowers.pl) 2/ At the OPAC, use the 'Immediate deletion' button to delete all your reading history (regardless the setting of the privacy rule) 3/ Use the cronjob script (misc/cronjobs/batch_anonymise.pl) to anonymise patrons. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
108 lines
7.1 KiB
Text
108 lines
7.1 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your privacy management</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-privacy' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div class="main">
|
|
<ul class="breadcrumb">
|
|
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li>
|
|
<li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">›</span></li>
|
|
<li><a href="#">Your privacy management</a></li>
|
|
</ul>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row-fluid">
|
|
<div class="span2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
<div class="span10">
|
|
<div id="userprivacy">
|
|
<h3>Your privacy management</h3>
|
|
|
|
[% IF deleted %]
|
|
<div class="alert alert-success">Your reading history has been deleted.</div>
|
|
[% ELSE %]
|
|
<div class="alert">No reading history to delete</div>
|
|
[% END %]
|
|
|
|
[% IF ( privacy_updated ) %]
|
|
<div class="alert alert-success">Your privacy rules have been updated.</div>
|
|
[% END %]
|
|
|
|
[% IF ( Ask_data ) %]
|
|
<p>We take great care in protecting your privacy. On this screen, you can define how long we keep your reading history.</p>
|
|
<p>Your options are: <p>
|
|
<ul id="opac-privacy-options-list">
|
|
<li class="privacy0">Forever: keep my reading history without limit. This is the option for users who want to keep track of what they are reading.</li>
|
|
<li class="privacy1">Default: keep my reading history according to local laws. This is the default option : the library will keep your reading history for the duration permitted by local laws.</li>
|
|
<li class="privacy2">Never: Delete my reading history immediately. This will delete all record of the item that was checked-out upon check-in.</li>
|
|
</ul>
|
|
<p id="note1">Please note that information on any book still checked-out must be kept by the library no matter which privacy option you choose.</p>
|
|
<p id="note2">Please also note that the library staff can't update these values for you: it's your privacy!</p>
|
|
<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
|
|
<input type="hidden" name="op" value="update_privacy" />
|
|
<fieldset>
|
|
<label for="privacy">Please choose your privacy rule:</label>
|
|
<div>
|
|
<select name="privacy" id="privacy">
|
|
[% IF ( privacy0 ) %]
|
|
<option value="0" selected="selected" class="privacy0">Forever</option>
|
|
[% ELSE %]
|
|
<option value="0" class="privacy0">Forever</option>
|
|
[% END %]
|
|
[% IF ( privacy1 ) %]
|
|
<option value="1" selected="selected" class="privacy1">Default</option>
|
|
[% ELSE %]
|
|
<option value="1" class="privacy1">Default</option>
|
|
[% END %]
|
|
[% IF ( privacy2 ) %]
|
|
<option value="2" selected="selected" class="privacy2">Never</option>
|
|
[% ELSE %]
|
|
<option value="2" class="privacy2">Never</option>
|
|
[% END %]
|
|
</select>
|
|
</div>
|
|
|
|
[% IF borrower.guarantorid && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
|
|
<div>
|
|
<label for="privacy_guarantor_checkouts">Allow your guarantor to view your current checkouts?</label>
|
|
<select name="privacy_guarantor_checkouts">
|
|
[% IF borrower.privacy_guarantor_checkouts %]
|
|
<option value="0">No</option>
|
|
<option value="1" selected>Yes</option>
|
|
[% ELSE %]
|
|
<option value="0" selected>No</option>
|
|
<option value="1">Yes</option>
|
|
[% END %]
|
|
</select>
|
|
<span class="hint">
|
|
Your guarantor is <i>[% borrower.guarantor.firstname %] [% borrower.guarantor.surname %]</i>
|
|
</span>
|
|
</div>
|
|
[% END %]
|
|
|
|
<button type="Submit" class="btn">Save</button>
|
|
</fieldset>
|
|
</form>
|
|
<h2>Immediate deletion</h2>
|
|
<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
|
|
<input type="hidden" name="op" value="delete_record" />
|
|
<p>Whatever your privacy rule you choose, you can delete all your reading history immediately by clicking here. <b>BE CAREFUL</b>. Once you've confirmed the deletion, no one can retrieve the list!</p>
|
|
<input type="submit" value="Immediate deletion" class="btn btn-danger" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
|
|
</form>
|
|
[% IF Koha.Preference('StoreLastBorrower') %]<p id="store-last-borrower-msg">Please note, the last person to return an item is tracked for the management of items returned damaged.</p>[% END %]
|
|
[% END # / IF Ask_data %]
|
|
</div> <!-- / .userprivacy -->
|
|
</div> <!-- / .span10 -->
|
|
</div> <!-- / .row-fluid -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|