Attachment #39044 for bug #9303

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

Lines 114-120 BEGIN { Link Here

(-)a/C4/Members.pm (-1 lines)
114	push @EXPORT, qw(	114	push @EXPORT, qw(
115	&ModMember	115	&ModMember
116	&changepassword	116	&changepassword
117	&ModPrivacy
118	);	117	);
119		118
120	#Delete data	119	#Delete data

Lines 268-273 sub GetReserve { Link Here

(-)a/C4/Reserves.pm (+1 lines)
268	my ($reserve_id) = @_;	268	my ($reserve_id) = @_;
269		269
270	my $dbh = C4::Context->dbh;	270	my $dbh = C4::Context->dbh;
		271
271	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";	272	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
272	my $sth = $dbh->prepare( $query );	273	my $sth = $dbh->prepare( $query );
273	$sth->execute( $reserve_id );	274	$sth->execute( $reserve_id );

Lines 582-587 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
582	no: "Don't allow"	582	no: "Don't allow"
583	- patrons to choose their own privacy settings for their reading history. This requires opacreadinghistory and AnonymousPatron	583	- patrons to choose their own privacy settings for their reading history. This requires opacreadinghistory and AnonymousPatron
584	-	584	-
		585	- pref: AllowPatronToSetCheckoutsVisibilityForGuarantor
		586	default: 0
		587	choices:
		588	yes: Allow
		589	no: "Don't allow"
		590	- patrons to choose their own privacy settings for showing the patron's checkouts to the patron's guarantor".
		591	-
585	- Use borrowernumber	592	- Use borrowernumber
586	- pref: AnonymousPatron	593	- pref: AnonymousPatron
587	class: integer	594	class: integer

Lines 128-133 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+6 lines)
128	no: "Don't"	128	no: "Don't"
129	- enable the ability to upload and attach arbitrary files to a borrower record.	129	- enable the ability to upload and attach arbitrary files to a borrower record.
130	-	130	-
		131	- pref: AllowStaffToSetCheckoutsVisibilityForGuarantor
		132	choices:
		133	yes: Allow
		134	no: "Don't allow"
		135	- staff to set the ability for a patron's checkouts to be viewed by linked patrons in the OPAC.
		136	-
131	- Card numbers for patrons must be	137	- Card numbers for patrons must be
132	- pref: CardnumberLength	138	- pref: CardnumberLength
133	- "characters long. The length can be a single number to specify an exact length, a range separated by a comma (i.e., 'Min,Max'), or a maximum with no minimum (i.e., ',Max')."	139	- "characters long. The length can be a single number to specify an exact length, a range separated by a comma (i.e., 'Min,Max'), or a maximum with no minimum (i.e., ',Max')."




[% USE Koha %]
[% USE KohaDates %]
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
[% INCLUDE 'doc-head-close.inc' %]

            [% END %]
            <input id="guarantordelete" type="button" value="Delete" />
        </li>
    [% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
        <li>
            <label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
            <select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
                [% IF 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>
            <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
        </li>
    [% END %]
        </ol>
    </fieldset>





         [% IF ( privacy1 ) %]Default[% END %]
         [% IF ( privacy2 ) %]Never[% END %]
    </li>[% END %]

    <li>
        <span class="label">Show checkouts to guarantor</span>
        [% IF privacy_guarantor_checkouts %]
            Yes
        [% ELSE %]
            No
        [% END %]
    </li>

    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
    <li><span class="label">Username: </span>[% userid %]</li>




                    <div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
                [% END %]

                [% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
                    <fieldset class="rows" id="memberentry_privacy">
                        <legend id="privacy_legend">Privacy</legend>
                        <ol>
                            <li>
                                <label>Allow your guarantor to view your current checkouts?</label>
                                <select id="privacy_guarantor_checkouts">
                                    <option value="0">No</option>
                                    [% IF borrower.privacy_guarantor_checkouts %]
                                        <option value="1" selected="selected">Yes</option>
                                    [% ELSE %]
                                        <option value="1">Yes</option>
                                    [% END %]
                                </select>
                                <span class="hint">
                                    <a id="update_privacy_guarantor_checkouts" href="#" class="btn">Update</a>
                                    <span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
                                </span>
                                <span class="hint">
                                    [% SET g = Koha.Find('Borrower',borrower.guarantorid) %]
                                    Your guarantor is <i>[% g.firstname %] [% g.surname %]</i>
                                </span>
                            </li>
                        </ol>
                    </fieldset>
                [% END %]

                <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">

                [% UNLESS hidden.defined('branchcode') %]

            [% ELSE %]
                $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
            [% END %]

            [% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
                $('#update_privacy_guarantor_checkouts').click( function() {
                    $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
                     .done(function( data ) {
                         var message;
                         if ( data.success ) {
                             message = _("Your setting has been updated!");
                         } else {
                             message = _("Unable to update your setting!");
                         }

                         $('#update_privacy_guarantor_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
                     });
                });
            [% END %]
        });
    //]]>
    </script>




                                <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>

                                                <option value="2" class="privacy2">Never</option>
                                            [% END %]
                                        </select>
                                        <button type="Submit" class="btn">Submit</button>
                                    </div>

                                    [% SET b = Koha.Find('Borrower', borrower.borrowernumber) %]
                                    [% IF b.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>[% b.guarantor.firstname %] [% b.guarantor.surname %]</i>
                                            </span>
                                        </div>
                                    [% END %]

                                    <button type="Submit" class="btn">Save</button>
                                </fieldset>
                            </form>
                        <h2>Immediate deletion</h2>




                    <div id="opac-user-views" class="toptabs">
                        <ul>
                            <li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
                            [% IF ( OPACFinesTab ) %]
                                [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]

                                                [% IF ( show_barcode ) %]
                                                    <th>Barcode</th>
                                                [% END %]
                                                    <th>Call number</th>
                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
                                                    <th class="nosort">Renew</th>
                                                [% END %]

                            </div> <!-- /#opac-user-waiting -->
                        [% END # waiting_count && atdestination %]

                        [% IF relatives %]
                            <div id="opac-user-relative-issues">
                                <table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
                                    <thead>
                                        <tr>
                                            <th class="anti-the">Title</th>
                                            <th>Due</th>
                                            <th>Barcode</th>
                                            <th>Call number</th>
                                            <th class="psort">Relative</th>
                                        </tr>
                                    </thead>

                                    <tbody>
                                        [% FOREACH r IN relatives %]
                                            [% FOREACH i IN r.issues %]
                                                <tr>
                                                    <td>
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
                                                            [% i.item.biblio.title %]
                                                        </a>
                                                    </td>

                                                    <td>
                                                        [% i.date_due | $KohaDates %]
                                                    </td>

                                                    <td>
                                                        [% i.item.barcode %]
                                                    </td>

                                                    <td>
                                                        [% i.item.itemcallnumber %]
                                                    </td>

                                                    <td>
                                                        [% r.firstname %] [% r.surname %]
                                                    </td>
                                                </tr>
                                            [% END %]
                                        [% END %]
                                    </tbody>
                                </table>
                            </div>
                        [% END %]

                        [% IF ( overdues_count ) %]
                            <div id="opac-user-overdues">

                                            <th class="anti-the">Title</th>
                                            [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
                                            [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
                                            <th>Call number</th>
                                            <th class="title-string psort">Due</th>
                                            [% IF ( OpacRenewalAllowed ) %]
                                                <th class="nosort">Renew</th>

            $(".js-hide").hide();
            $(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
            $(".suspend-until").prop("readonly",1);

            var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
            dTables.each(function(){
                var thIndex = $(this).find("th.psort").index();
                $(this).dataTable($.extend(true, {}, dataTablesDefaults, {

Lines 355-360 $template->param( Link Here

(-)a/members/moremember.pl (+1 lines)
355	is_child => ($category_type eq 'C'),	355	is_child => ($category_type eq 'C'),
356	samebranch => $samebranch,	356	samebranch => $samebranch,
357	quickslip => $quickslip,	357	quickslip => $quickslip,
		358	privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
358	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	359	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
359	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),	360	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
360	SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),	361	SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),

Lines 47-64 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-privacy.pl (-14 / +24 lines)
47	}	47	}
48	);	48	);
49		49
50	my $op = $query->param("op");	50	my $op = $query->param("op");
51	my $privacy = $query->param("privacy");	51	my $privacy = $query->param("privacy");
		52	my $privacy_guarantor_checkouts = $query->param("privacy_guarantor_checkouts");
52		53
53	if ($op eq "update_privacy")	54	if ( $op eq "update_privacy" ) {
54	{	55	ModMember(
55	ModPrivacy($borrowernumber,$privacy);	56	borrowernumber => $borrowernumber,
56	$template->param('privacy_updated' => 1);	57	privacy => $privacy,
		58	privacy_guarantor_checkouts => $privacy_guarantor_checkouts,
		59	);
		60	$template->param( 'privacy_updated' => 1 );
57	}	61	}
58	if ($op eq "delete_record") {	62	elsif ( $op eq "delete_record" ) {
		63
59	# delete all reading records for items returned	64	# delete all reading records for items returned
60	# uses a hardcoded date ridiculously far in the future	65	# uses a hardcoded date ridiculously far in the future
61	my ($rows,$err_history_not_deleted) = AnonymiseIssueHistory('2999-12-12',$borrowernumber);	66	my ( $rows, $err_history_not_deleted ) =
		67	AnonymiseIssueHistory( '2999-12-12', $borrowernumber );
		68
62	# confirm the user the deletion has been done	69	# confirm the user the deletion has been done
63	if ( !$err_history_not_deleted ) {	70	if ( !$err_history_not_deleted ) {
64	$template->param( 'deleted' => 1 );	71	$template->param( 'deleted' => 1 );
Lines 67-80 if ($op eq "delete_record") { Link Here
67	$template->param( 'err_history_not_deleted' => 1 );	74	$template->param( 'err_history_not_deleted' => 1 );
68	}	75	}
69	}	76	}
		77
70	# get borrower privacy ....	78	# get borrower privacy ....
71	my ( $borr ) = GetMemberDetails( $borrowernumber );	79	my $borrower = GetMemberDetails( $borrowernumber );
72		80
73	$template->param( 'Ask_data' => '1',	81	$template->param(
74	'privacy'.$borr->{'privacy'} => 1,	82	'Ask_data' => 1,
75	'firstname' => $borr->{'firstname'},	83	'privacy' . $borrower->{'privacy'} => 1,
76	'surname' => $borr->{'surname'},	84	'privacyview' => 1,
77	'privacyview' => 1,	85	'borrower' => $borrower,
		86	'surname' => $borrower->{surname},
		87	'firstname' => $borrower->{firstname},
78	);	88	);
79		89
80	output_html_with_http_headers $query, $cookie, $template->output;	90	output_html_with_http_headers $query, $cookie, $template->output;




use C4::Branch; # GetBranches
use Koha::DateUtils;
use Koha::Borrower::Debarments qw(IsDebarred);
use Koha::Database;

use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';


  );
}

if (   C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
    || C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
{
    my @relatives =
      Koha::Database->new()->schema()->resultset("Borrower")->search(
        {
            privacy_guarantor_checkouts => 1,
            'me.guarantorid'           => $borrowernumber
        },
        { prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
      );
    $template->param( relatives => \@relatives );
}

$template->param(
    borrower           => $borr,
    bor_messages_loop  => GetMessages( $borrowernumber, 'B', 'NONE' ),
    waiting_count      => $wcount,
    patronupdate       => $patronupdate,
    OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
    userview           => 1,
    SuspendHoldsOpac   => C4::Context->preference('SuspendHoldsOpac'),
    OpacHoldNotes      => C4::Context->preference('OpacHoldNotes'),
    AutoResumeSuspendedHolds =>
      C4::Context->preference('AutoResumeSuspendedHolds'),
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
    OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
);

output_html_with_http_headers $query, $cookie, $template->output;
- 

Return to bug 9303

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (+16 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
		3	[% USE Koha %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>	5	<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]
Lines 465-470 Link Here
465	[% END %]	466	[% END %]
466	<input id="guarantordelete" type="button" value="Delete" />	467	<input id="guarantordelete" type="button" value="Delete" />
467	</li>	468	</li>
		469	[% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
		470	<li>
		471	<label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
		472	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
		473	[% IF privacy_guarantor_checkouts %]
		474	<option value="0">No</option>
		475	<option value="1" selected>Yes</option>
		476	[% ELSE %]
		477	<option value="0" selected>No</option>
		478	<option value="1">Yes</option>
		479	[% END %]
		480	</select>
		481	<div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
		482	</li>
		483	[% END %]
468	</ol>	484	</ol>
469	</fieldset>	485	</fieldset>
470		486

Lines 358-363 function validate1(date) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+10 lines)
358	[% IF ( privacy1 ) %]Default[% END %]	358	[% IF ( privacy1 ) %]Default[% END %]
359	[% IF ( privacy2 ) %]Never[% END %]	359	[% IF ( privacy2 ) %]Never[% END %]
360	</li>[% END %]	360	</li>[% END %]
		361
		362	<li>
		363	<span class="label">Show checkouts to guarantor</span>
		364	[% IF privacy_guarantor_checkouts %]
		365	Yes
		366	[% ELSE %]
		367	No
		368	[% END %]
		369	</li>
		370
361	[% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]	371	[% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
362	[% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]	372	[% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
363	<li><span class="label">Username: </span>[% userid %]</li>	373	<li><span class="label">Username: </span>[% userid %]</li>

Lines 54-59 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (+43 lines)
54	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>	54	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
55	[% END %]	55	[% END %]
56		56
		57	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
		58	<fieldset class="rows" id="memberentry_privacy">
		59	<legend id="privacy_legend">Privacy</legend>
		60	<ol>
		61	<li>
		62	<label>Allow your guarantor to view your current checkouts?</label>
		63	<select id="privacy_guarantor_checkouts">
		64	<option value="0">No</option>
		65	[% IF borrower.privacy_guarantor_checkouts %]
		66	<option value="1" selected="selected">Yes</option>
		67	[% ELSE %]
		68	<option value="1">Yes</option>
		69	[% END %]
		70	</select>
		71	<span class="hint">
		72	<a id="update_privacy_guarantor_checkouts" href="#" class="btn">Update</a>
		73	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
		74	</span>
		75	<span class="hint">
		76	[% SET g = Koha.Find('Borrower',borrower.guarantorid) %]
		77	Your guarantor is <i>[% g.firstname %] [% g.surname %]</i>
		78	</span>
		79	</li>
		80	</ol>
		81	</fieldset>
		82	[% END %]
		83
57	<form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">	84	<form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
58		85
59	[% UNLESS hidden.defined('branchcode') %]	86	[% UNLESS hidden.defined('branchcode') %]
Lines 796-801 Link Here
796	[% ELSE %]	823	[% ELSE %]
797	$( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });	824	$( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
798	[% END %]	825	[% END %]
		826
		827	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
		828	$('#update_privacy_guarantor_checkouts').click( function() {
		829	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
		830	.done(function( data ) {
		831	var message;
		832	if ( data.success ) {
		833	message = _("Your setting has been updated!");
		834	} else {
		835	message = _("Unable to update your setting!");
		836	}
		837
		838	$('#update_privacy_guarantor_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
		839	});
		840	});
		841	[% END %]
799	});	842	});
800	//]]>	843	//]]>
801	</script>	844	</script>

Lines 48-54 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-2 / +22 lines)
48	<input type="hidden" name="op" value="update_privacy" />	48	<input type="hidden" name="op" value="update_privacy" />
49	<fieldset>	49	<fieldset>
50	<label for="privacy">Please choose your privacy rule:</label>	50	<label for="privacy">Please choose your privacy rule:</label>
51	<div class="input-append">	51	<div>
52	<select name="privacy" id="privacy">	52	<select name="privacy" id="privacy">
53	[% IF ( privacy0 ) %]	53	[% IF ( privacy0 ) %]
54	<option value="0" selected="selected" class="privacy0">Forever</option>	54	<option value="0" selected="selected" class="privacy0">Forever</option>
Lines 66-73 Link Here
66	<option value="2" class="privacy2">Never</option>	66	<option value="2" class="privacy2">Never</option>
67	[% END %]	67	[% END %]
68	</select>	68	</select>
69	<button type="Submit" class="btn">Submit</button>
70	</div>	69	</div>
		70
		71	[% SET b = Koha.Find('Borrower', borrower.borrowernumber) %]
		72	[% IF b.guarantorid && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
		73	<div>
		74	<label for="privacy_guarantor_checkouts">Allow your guarantor to view your current checkouts?</label>
		75	<select name="privacy_guarantor_checkouts">
		76	[% IF borrower.privacy_guarantor_checkouts %]
		77	<option value="0">No</option>
		78	<option value="1" selected>Yes</option>
		79	[% ELSE %]
		80	<option value="0" selected>No</option>
		81	<option value="1">Yes</option>
		82	[% END %]
		83	</select>
		84	<span class="hint">
		85	Your guarantor is <i>[% b.guarantor.firstname %] [% b.guarantor.surname %]</i>
		86	</span>
		87	</div>
		88	[% END %]
		89
		90	<button type="Submit" class="btn">Save</button>
71	</fieldset>	91	</fieldset>
72	</form>	92	</form>
73	<h2>Immediate deletion</h2>	93	<h2>Immediate deletion</h2>

Lines 104-109 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +50 lines)
104	<div id="opac-user-views" class="toptabs">	104	<div id="opac-user-views" class="toptabs">
105	<ul>	105	<ul>
106	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>	106	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>
		107	[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
107	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]	108	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
108	[% IF ( OPACFinesTab ) %]	109	[% IF ( OPACFinesTab ) %]
109	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	110	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]
Lines 132-138 Link Here
132	[% IF ( show_barcode ) %]	133	[% IF ( show_barcode ) %]
133	<th>Barcode</th>	134	<th>Barcode</th>
134	[% END %]	135	[% END %]
135	<th>Call No.</th>	136	<th>Call number</th>
136	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]	137	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
137	<th class="nosort">Renew</th>	138	<th class="nosort">Renew</th>
138	[% END %]	139	[% END %]
Lines 365-370 Link Here
365	</div> <!-- /#opac-user-waiting -->	366	</div> <!-- /#opac-user-waiting -->
366	[% END # waiting_count && atdestination %]	367	[% END # waiting_count && atdestination %]
367		368
		369	[% IF relatives %]
		370	<div id="opac-user-relative-issues">
		371	<table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
		372	<thead>
		373	<tr>
		374	<th class="anti-the">Title</th>
		375	<th>Due</th>
		376	<th>Barcode</th>
		377	<th>Call number</th>
		378	<th class="psort">Relative</th>
		379	</tr>
		380	</thead>
		381
		382	<tbody>
		383	[% FOREACH r IN relatives %]
		384	[% FOREACH i IN r.issues %]
		385	<tr>
		386	<td>
		387	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
		388	[% i.item.biblio.title %]
		389	</a>
		390	</td>
		391
		392	<td>
		393	[% i.date_due \| $KohaDates %]
		394	</td>
		395
		396	<td>
		397	[% i.item.barcode %]
		398	</td>
		399
		400	<td>
		401	[% i.item.itemcallnumber %]
		402	</td>
		403
		404	<td>
		405	[% r.firstname %] [% r.surname %]
		406	</td>
		407	</tr>
		408	[% END %]
		409	[% END %]
		410	</tbody>
		411	</table>
		412	</div>
		413	[% END %]
368		414
369	[% IF ( overdues_count ) %]	415	[% IF ( overdues_count ) %]
370	<div id="opac-user-overdues">	416	<div id="opac-user-overdues">
Lines 377-383 Link Here
377	<th class="anti-the">Title</th>	423	<th class="anti-the">Title</th>
378	[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]	424	[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
379	[% IF ( show_barcode ) %]<th>Barcode</th>[% END %]	425	[% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
380	<th>Call no.</th>	426	<th>Call number</th>
381	<th class="title-string psort">Due</th>	427	<th class="title-string psort">Due</th>
382	[% IF ( OpacRenewalAllowed ) %]	428	[% IF ( OpacRenewalAllowed ) %]
383	<th class="nosort">Renew</th>	429	<th class="nosort">Renew</th>
Lines 692-698 Link Here
692	$(".js-hide").hide();	738	$(".js-hide").hide();
693	$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");	739	$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
694	$(".suspend-until").prop("readonly",1);	740	$(".suspend-until").prop("readonly",1);
695	var dTables = $("#checkoutst,#holdst,#overduest");	741
		742	var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
696	dTables.each(function(){	743	dTables.each(function(){
697	var thIndex = $(this).find("th.psort").index();	744	var thIndex = $(this).find("th.psort").index();
698	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {	745	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {

Lines 36-41 use C4::Letters; Link Here

(-)a/opac/opac-user.pl (-10 / +23 lines)
36	use C4::Branch; # GetBranches	36	use C4::Branch; # GetBranches
37	use Koha::DateUtils;	37	use Koha::DateUtils;
38	use Koha::Borrower::Debarments qw(IsDebarred);	38	use Koha::Borrower::Debarments qw(IsDebarred);
		39	use Koha::Database;
39		40
40	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';	41	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
41		42
Lines 383-400 if ( $borr->{'opacnote'} ) { Link Here
383	);	384	);
384	}	385	}
385		386
		387	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
		388	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
		389	{
		390	my @relatives =
		391	Koha::Database->new()->schema()->resultset("Borrower")->search(
		392	{
		393	privacy_guarantor_checkouts => 1,
		394	'me.guarantorid' => $borrowernumber
		395	},
		396	{ prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
		397	);
		398	$template->param( relatives => \@relatives );
		399	}
		400
386	$template->param(	401	$template->param(
387	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),	402	borrower => $borr,
		403	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
388	waiting_count => $wcount,	404	waiting_count => $wcount,
389	patronupdate => $patronupdate,	405	patronupdate => $patronupdate,
390	OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),	406	OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
391	userview => 1,	407	userview => 1,
392	);	408	SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
393		409	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
394	$template->param(	410	AutoResumeSuspendedHolds =>
395	SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),	411	C4::Context->preference('AutoResumeSuspendedHolds'),
396	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
397	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
398	);	412	);
399		413
400	output_html_with_http_headers $query, $cookie, $template->output;	414	output_html_with_http_headers $query, $cookie, $template->output;
401	-