Attachment #44432 for bug #9303

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

Lines 115-121 BEGIN { Link Here

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

Lines 255-260 sub GetReserve { Link Here

(-)a/C4/Reserves.pm (+1 lines)
255	my ($reserve_id) = @_;	255	my ($reserve_id) = @_;
256		256
257	my $dbh = C4::Context->dbh;	257	my $dbh = C4::Context->dbh;
		258
258	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";	259	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
259	my $sth = $dbh->prepare( $query );	260	my $sth = $dbh->prepare( $query );
260	$sth->execute( $reserve_id );	261	$sth->execute( $reserve_id );

Lines 589-594 OPAC: Link Here

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

Lines 137-142 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+6 lines)
137	no: "Don't"	137	no: "Don't"
138	- enable the ability to upload and attach arbitrary files to a borrower record.	138	- enable the ability to upload and attach arbitrary files to a borrower record.
139	-	139	-
		140	- pref: AllowStaffToSetCheckoutsVisibilityForGuarantor
		141	choices:
		142	yes: Allow
		143	no: "Don't allow"
		144	- staff to set the ability for a patron's checkouts to be viewed by linked patrons in the OPAC.
		145	-
140	- Card numbers for patrons must be	146	- Card numbers for patrons must be
141	- pref: CardnumberLength	147	- pref: CardnumberLength
142	- "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')."	148	- "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 %]

            $("#memberentry-form").validate({
                rules: {
                    borrower_email: {

                    error.css('width', 'auto');
                }
            });

            [% 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 350-355 $template->param( Link Here

(-)a/members/moremember.pl (+1 lines)
350	is_child => ($category_type eq 'C'),	350	is_child => ($category_type eq 'C'),
351	samebranch => $samebranch,	351	samebranch => $samebranch,
352	quickslip => $quickslip,	352	quickslip => $quickslip,
		353	privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
353	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	354	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
354	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),	355	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
355	SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),	356	SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),

Lines 45-62 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

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




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

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 490-495 Link Here
490	[% END %]	491	[% END %]
491	<input id="guarantordelete" type="button" value="Delete" />	492	<input id="guarantordelete" type="button" value="Delete" />
492	</li>	493	</li>
		494	[% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
		495	<li>
		496	<label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
		497	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
		498	[% IF privacy_guarantor_checkouts %]
		499	<option value="0">No</option>
		500	<option value="1" selected>Yes</option>
		501	[% ELSE %]
		502	<option value="0" selected>No</option>
		503	<option value="1">Yes</option>
		504	[% END %]
		505	</select>
		506	<div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
		507	</li>
		508	[% END %]
493	</ol>	509	</ol>
494	</fieldset>	510	</fieldset>
495		511

Lines 354-359 function validate1(date) { Link Here

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

Lines 70-75 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (+44 lines)
70	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>	70	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
71	[% END %]	71	[% END %]
72		72
		73	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
		74	<fieldset class="rows" id="memberentry_privacy">
		75	<legend id="privacy_legend">Privacy</legend>
		76	<ol>
		77	<li>
		78	<label>Allow your guarantor to view your current checkouts?</label>
		79	<select id="privacy_guarantor_checkouts">
		80	<option value="0">No</option>
		81	[% IF borrower.privacy_guarantor_checkouts %]
		82	<option value="1" selected="selected">Yes</option>
		83	[% ELSE %]
		84	<option value="1">Yes</option>
		85	[% END %]
		86	</select>
		87	<span class="hint">
		88	<a id="update_privacy_guarantor_checkouts" href="#" class="btn">Update</a>
		89	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
		90	</span>
		91	<span class="hint">
		92	[% SET g = Koha.Find('Borrower',borrower.guarantorid) %]
		93	Your guarantor is <i>[% g.firstname %] [% g.surname %]</i>
		94	</span>
		95	</li>
		96	</ol>
		97	</fieldset>
		98	[% END %]
		99
73	<form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">	100	<form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
74		101
75	[% UNLESS hidden.defined('branchcode') %]	102	[% UNLESS hidden.defined('branchcode') %]
Lines 822-827 Link Here
822	[% ELSE %]	849	[% ELSE %]
823	$( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });	850	$( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
824	[% END %]	851	[% END %]
		852
825	$("#memberentry-form").validate({	853	$("#memberentry-form").validate({
826	rules: {	854	rules: {
827	borrower_email: {	855	borrower_email: {
Lines 853-858 Link Here
853	error.css('width', 'auto');	881	error.css('width', 'auto');
854	}	882	}
855	});	883	});
		884
		885	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
		886	$('#update_privacy_guarantor_checkouts').click( function() {
		887	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
		888	.done(function( data ) {
		889	var message;
		890	if ( data.success ) {
		891	message = _("Your setting has been updated!");
		892	} else {
		893	message = _("Unable to update your setting!");
		894	}
		895
		896	$('#update_privacy_guarantor_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
		897	});
		898	});
		899	[% END %]
856	});	900	});
857	//]]>	901	//]]>
858	</script>	902	</script>

Lines 49-55 Link Here

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

Lines 111-116 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +50 lines)
111	<div id="opac-user-views" class="toptabs">	111	<div id="opac-user-views" class="toptabs">
112	<ul>	112	<ul>
113	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>	113	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>
		114	[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
114	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]	115	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
115	[% IF ( OPACFinesTab ) %]	116	[% IF ( OPACFinesTab ) %]
116	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	117	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]
Lines 139-145 Link Here
139	[% IF ( show_barcode ) %]	140	[% IF ( show_barcode ) %]
140	<th>Barcode</th>	141	<th>Barcode</th>
141	[% END %]	142	[% END %]
142	<th>Call No.</th>	143	<th>Call number</th>
143	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]	144	[% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
144	<th class="nosort">Renew</th>	145	<th class="nosort">Renew</th>
145	[% END %]	146	[% END %]
Lines 375-380 Link Here
375	</div> <!-- /#opac-user-waiting -->	376	</div> <!-- /#opac-user-waiting -->
376	[% END # waiting_count && atdestination %]	377	[% END # waiting_count && atdestination %]
377		378
		379	[% IF relatives %]
		380	<div id="opac-user-relative-issues">
		381	<table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
		382	<thead>
		383	<tr>
		384	<th class="anti-the">Title</th>
		385	<th>Due</th>
		386	<th>Barcode</th>
		387	<th>Call number</th>
		388	<th class="psort">Relative</th>
		389	</tr>
		390	</thead>
		391
		392	<tbody>
		393	[% FOREACH r IN relatives %]
		394	[% FOREACH i IN r.issues %]
		395	<tr>
		396	<td>
		397	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
		398	[% i.item.biblio.title %]
		399	</a>
		400	</td>
		401
		402	<td>
		403	[% i.date_due \| $KohaDates %]
		404	</td>
		405
		406	<td>
		407	[% i.item.barcode %]
		408	</td>
		409
		410	<td>
		411	[% i.item.itemcallnumber %]
		412	</td>
		413
		414	<td>
		415	[% r.firstname %] [% r.surname %]
		416	</td>
		417	</tr>
		418	[% END %]
		419	[% END %]
		420	</tbody>
		421	</table>
		422	</div>
		423	[% END %]
378		424
379	[% IF ( overdues_count ) %]	425	[% IF ( overdues_count ) %]
380	<div id="opac-user-overdues">	426	<div id="opac-user-overdues">
Lines 387-393 Link Here
387	<th class="anti-the">Title</th>	433	<th class="anti-the">Title</th>
388	[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]	434	[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
389	[% IF ( show_barcode ) %]<th>Barcode</th>[% END %]	435	[% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
390	<th>Call no.</th>	436	<th>Call number</th>
391	<th class="title-string psort">Due</th>	437	<th class="title-string psort">Due</th>
392	[% IF ( OpacRenewalAllowed ) %]	438	[% IF ( OpacRenewalAllowed ) %]
393	<th class="nosort">Renew</th>	439	<th class="nosort">Renew</th>
Lines 705-711 Link Here
705	$(".js-hide").hide();	751	$(".js-hide").hide();
706	$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");	752	$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
707	$(".suspend-until").prop("readonly",1);	753	$(".suspend-until").prop("readonly",1);
708	var dTables = $("#checkoutst,#holdst,#overduest");	754
		755	var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
709	dTables.each(function(){	756	dTables.each(function(){
710	var thIndex = $(this).find("th.psort").index();	757	var thIndex = $(this).find("th.psort").index();
711	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {	758	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {

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

(-)a/opac/opac-user.pl (-1 / +16 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 387-393 if ( $borr->{'opacnote'} ) { Link Here
387	);	388	);
388	}	389	}
389		390
		391	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
		392	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
		393	{
		394	my @relatives =
		395	Koha::Database->new()->schema()->resultset("Borrower")->search(
		396	{
		397	privacy_guarantor_checkouts => 1,
		398	'me.guarantorid' => $borrowernumber
		399	},
		400	{ prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
		401	);
		402	$template->param( relatives => \@relatives );
		403	}
		404
390	$template->param(	405	$template->param(
		406	borrower => $borr,
391	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),	407	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
392	waiting_count => $wcount,	408	waiting_count => $wcount,
393	patronupdate => $patronupdate,	409	patronupdate => $patronupdate,
394	-