Attachment #24775 for bug #9303

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




    push @EXPORT, qw(
        &ModMember
        &changepassword
         &ModPrivacy
    );

    #Delete data

    return $results;
}

=head2 ModPrivacy

=over 4

my $success = ModPrivacy( $borrowernumber, $privacy );

Update the privacy of a patron.

return :
true on success, false on failure

=back

=cut

sub ModPrivacy {
    my $borrowernumber = shift;
    my $privacy = shift;
    return unless defined $borrowernumber;
    return unless $borrowernumber =~ /^\d+$/;

    return ModMember( borrowernumber => $borrowernumber,
                      privacy        => $privacy );
}

=head2 AddMessage

  AddMessage( $borrowernumber, $message_type, $message, $branchcode );




    my ($reserve_id) = @_;

    my $dbh = C4::Context->dbh;

    my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
    my $sth = $dbh->prepare( $query );
    $sth->execute( $reserve_id );
    my $res = $sth->fetchrow_hashref();

    unless ($res) {
        $query = "SELECT * FROM old_reserves WHERE reserve_id = ?";
        $sth   = $dbh->prepare($query);
        $sth->execute($reserve_id);
        $res = $sth->fetchrow_hashref();
    }

    carp("No hold for for reserve_id $reserve_id") unless $res;

    return $res;
}

=head2 GetReservesFromBiblionumber




			[% END %]
	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %]
		</li>
        <li>
            <label for="privacy_relative_checkouts">Show checkouts to relatives</label>
            <select name="privacy_relative_checkouts" id="privacy_relative_checkouts">
                [% IF privacy_relative_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 linked patron accounts to view this patron's checkouts from the OPAC</div>
        </li>
		</ol>
		</fieldset>
        [% END # hide fieldset %][% END %]




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

                                    <div>
                                        <label for="privacy_relative_checkouts">Allow relatives to view your current checkouts?</label>
                                        <select name="privacy_relative_checkouts">
                                            [% IF borrower.privacy_relative_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>

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




[% USE Koha %]
[% USE KohaDates %]
[% USE EncodeUTF8 %]

[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home

                    <div id="opac-user-views" class="toptabs">
                        <ul>
                            <li><a href="#opac-user-checkouts">Checked out</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</a></li>[% END %]
                            [% IF ( OPACFinesTab ) %]
                                [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% 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 No.</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 | $EncodeUTF8 %]
                                                        </a>
                                                    </td>

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

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

                                                    <td>
                                                        [% i.item.itemcallnumber | $EncodeUTF8 %]
                                                    </td>

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

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

        $(function() {
            $('#opac-user-views').tabs();

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




    </div>
    <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
            <input type="hidden" name="op" value="update_privacy" />

            <label for="privacy">Please choose your privacy rule:</label>
            <select name="privacy">
                [% IF ( privacy0 ) %]
                    <option value="0" selected="1" class="privacy0">Forever</option>

                    <option value="2" class="privacy2">Never</option>
                [% END %]
            </select>

            <p/>

            <label for="privacy_relative_checkouts">Allow relatives to view your current checkouts?</label>
            <select name="privacy_relative_checkouts">
                [% IF borrower.privacy_relative_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>

            <p/>

            <input type="Submit" value="Save" />
        </form>
        <h2>Immediate deletion</h2>
        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">




[% USE Koha %]
[% USE KohaDates %]
[% USE EncodeUTF8 %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
[% INCLUDE 'doc-head-close.inc' %]

            $(function() {
            $('#opac-user-views').tabs();

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

<div id="opac-user-views" class="toptabs">
        <ul>
            <li><a href="#opac-user-checkouts">Checked out</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</a></li>[% END %]
[% IF ( OPACFinesTab ) %]
            [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]

        [% END %]
    [% END %]

    [% IF relatives %]
        <div id="opac-user-relative-issues">
            <table id="opac-user-relative-issues-table">
                <thead>
                    <tr>
                        <th class="anti-the">Title</th>
                        <th>Due</th>
                        <th>Barcode</th>
                        <th>Call No.</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 | $EncodeUTF8 %]
                                    </a>
                                </td>

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

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

                                <td>
                                    [% i.item.itemcallnumber | $EncodeUTF8 %]
                                </td>

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

[% IF ( overdues_count ) %]
<div id="opac-user-overdues"><table id="overduest">
<caption>Overdues <span class="count">([% overdues_count %] total)</span></caption>

Lines 40-57 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

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




use C4::Letters;
use C4::Branch; # GetBranches
use Koha::DateUtils;
use Koha::Database;

use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';


  );
}

my @borrowernumbers = GetMemberRelatives($borrowernumber);
if ( @borrowernumbers ) {
    my @relatives = Koha::Database->new()->schema()->resultset("Borrower")->search(
        { privacy_relative_checkouts => 1,  'me.borrowernumber' => { -in => \@borrowernumbers, } },
        { 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 112-118 BEGIN { Link Here

(-)a/C4/Members.pm (-26 lines)
112	push @EXPORT, qw(	112	push @EXPORT, qw(
113	&ModMember	113	&ModMember
114	&changepassword	114	&changepassword
115	&ModPrivacy
116	);	115	);
117		116
118	#Delete data	117	#Delete data
Lines 2216-2246 sub GetBorrowersNamesAndLatestIssue { Link Here
2216	return $results;	2215	return $results;
2217	}	2216	}
2218		2217
2219	=head2 ModPrivacy
2220
2221	=over 4
2222
2223	my $success = ModPrivacy( $borrowernumber, $privacy );
2224
2225	Update the privacy of a patron.
2226
2227	return :
2228	true on success, false on failure
2229
2230	=back
2231
2232	=cut
2233
2234	sub ModPrivacy {
2235	my $borrowernumber = shift;
2236	my $privacy = shift;
2237	return unless defined $borrowernumber;
2238	return unless $borrowernumber =~ /^\d+$/;
2239
2240	return ModMember( borrowernumber => $borrowernumber,
2241	privacy => $privacy );
2242	}
2243
2244	=head2 AddMessage	2218	=head2 AddMessage
2245		2219
2246	AddMessage( $borrowernumber, $message_type, $message, $branchcode );	2220	AddMessage( $borrowernumber, $message_type, $message, $branchcode );

Lines 260-269 sub GetReserve { Link Here

(-)a/C4/Reserves.pm (-1 / +13 lines)
260	my ($reserve_id) = @_;	260	my ($reserve_id) = @_;
261		261
262	my $dbh = C4::Context->dbh;	262	my $dbh = C4::Context->dbh;
		263
263	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";	264	my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
264	my $sth = $dbh->prepare( $query );	265	my $sth = $dbh->prepare( $query );
265	$sth->execute( $reserve_id );	266	$sth->execute( $reserve_id );
266	return $sth->fetchrow_hashref();	267	my $res = $sth->fetchrow_hashref();
		268
		269	unless ($res) {
		270	$query = "SELECT * FROM old_reserves WHERE reserve_id = ?";
		271	$sth = $dbh->prepare($query);
		272	$sth->execute($reserve_id);
		273	$res = $sth->fetchrow_hashref();
		274	}
		275
		276	carp("No hold for for reserve_id $reserve_id") unless $res;
		277
		278	return $res;
267	}	279	}
268		280
269	=head2 GetReservesFromBiblionumber	281	=head2 GetReservesFromBiblionumber

Lines 1157-1162 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (+13 lines)
1157	[% END %]	1157	[% END %]
1158	[% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %]	1158	[% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %]
1159	</li>	1159	</li>
		1160	<li>
		1161	<label for="privacy_relative_checkouts">Show checkouts to relatives</label>
		1162	<select name="privacy_relative_checkouts" id="privacy_relative_checkouts">
		1163	[% IF privacy_relative_checkouts %]
		1164	<option value="0">No</option>
		1165	<option value="1" selected>Yes</option>
		1166	[% ELSE %]
		1167	<option value="0" selected>No</option>
		1168	<option value="1">Yes</option>
		1169	[% END %]
		1170	</select>
		1171	<div class="hint">Allow linked patron accounts to view this patron's checkouts from the OPAC</div>
		1172	</li>
1160	</ol>	1173	</ol>
1161	</fieldset>	1174	</fieldset>
1162	[% END # hide fieldset %][% END %]	1175	[% END # hide fieldset %][% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +48 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
		3	[% USE EncodeUTF8 %]
3		4
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home	6	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
Lines 83-88 Link Here
83	<div id="opac-user-views" class="toptabs">	84	<div id="opac-user-views" class="toptabs">
84	<ul>	85	<ul>
85	<li><a href="#opac-user-checkouts">Checked out</a></li>	86	<li><a href="#opac-user-checkouts">Checked out</a></li>
		87	[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
86	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue</a></li>[% END %]	88	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue</a></li>[% END %]
87	[% IF ( OPACFinesTab ) %]	89	[% IF ( OPACFinesTab ) %]
88	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]	90	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]
Lines 341-346 Link Here
341	</div> <!-- /#opac-user-waiting -->	343	</div> <!-- /#opac-user-waiting -->
342	[% END # waiting_count && atdestination %]	344	[% END # waiting_count && atdestination %]
343		345
		346	[% IF relatives %]
		347	<div id="opac-user-relative-issues">
		348	<table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
		349	<thead>
		350	<tr>
		351	<th class="anti-the">Title</th>
		352	<th>Due</th>
		353	<th>Barcode</th>
		354	<th>Call No.</th>
		355	<th class="psort">Relative</th>
		356	</tr>
		357	</thead>
		358
		359	<tbody>
		360	[% FOREACH r IN relatives %]
		361	[% FOREACH i IN r.issues %]
		362	<tr>
		363	<td>
		364	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
		365	[% i.item.biblio.title \| $EncodeUTF8 %]
		366	</a>
		367	</td>
		368
		369	<td>
		370	[% i.date_due \| $KohaDates %]
		371	</td>
		372
		373	<td>
		374	[% i.item.barcode %]
		375	</td>
		376
		377	<td>
		378	[% i.item.itemcallnumber \| $EncodeUTF8 %]
		379	</td>
		380
		381	<td>
		382	[% r.firstname \| $EncodeUTF8 %] [% r.surname \| $EncodeUTF8 %]
		383	</td>
		384	</tr>
		385	[% END %]
		386	[% END %]
		387	</tbody>
		388	</table>
		389	</div>
		390	[% END %]
344		391
345	[% IF ( overdues_count ) %]	392	[% IF ( overdues_count ) %]
346	<div id="opac-user-overdues">	393	<div id="opac-user-overdues">
Lines 634-640 Link Here
634	$(function() {	681	$(function() {
635	$('#opac-user-views').tabs();	682	$('#opac-user-views').tabs();
636		683
637	var dTables = $("#checkoutst,#holdst,#overduest");	684	var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
638	dTables.each(function(){	685	dTables.each(function(){
639	var thIndex = $(this).find("th.psort").index();	686	var thIndex = $(this).find("th.psort").index();
640	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {	687	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {

Lines 35-40 use C4::Items; Link Here

(-)a/opac/opac-user.pl (-10 / +18 lines)
35	use C4::Letters;	35	use C4::Letters;
36	use C4::Branch; # GetBranches	36	use C4::Branch; # GetBranches
37	use Koha::DateUtils;	37	use Koha::DateUtils;
		38	use Koha::Database;
38		39
39	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';	40	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
40		41
Lines 352-369 if ( $borr->{'opacnote'} ) { Link Here
352	);	353	);
353	}	354	}
354		355
		356	my @borrowernumbers = GetMemberRelatives($borrowernumber);
		357	if ( @borrowernumbers ) {
		358	my @relatives = Koha::Database->new()->schema()->resultset("Borrower")->search(
		359	{ privacy_relative_checkouts => 1, 'me.borrowernumber' => { -in => \@borrowernumbers, } },
		360	{ prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
		361	);
		362	$template->param( relatives => \@relatives );
		363	}
		364
355	$template->param(	365	$template->param(
356	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),	366	borrower => $borr,
		367	bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
357	waiting_count => $wcount,	368	waiting_count => $wcount,
358	patronupdate => $patronupdate,	369	patronupdate => $patronupdate,
359	OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),	370	OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
360	userview => 1,	371	userview => 1,
361	);	372	SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
362		373	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
363	$template->param(	374	AutoResumeSuspendedHolds =>
364	SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),	375	C4::Context->preference('AutoResumeSuspendedHolds'),
365	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
366	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
367	);	376	);
368		377
369	output_html_with_http_headers $query, $cookie, $template->output;	378	output_html_with_http_headers $query, $cookie, $template->output;
370	-

Lines 48-54 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-2 / +16 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	<div>
		72	<label for="privacy_relative_checkouts">Allow relatives to view your current checkouts?</label>
		73	<select name="privacy_relative_checkouts">
		74	[% IF borrower.privacy_relative_checkouts %]
		75	<option value="0">No</option>
		76	<option value="1" selected>Yes</option>
		77	[% ELSE %]
		78	<option value="0" selected>No</option>
		79	<option value="1">Yes</option>
		80	[% END %]
		81	</select>
		82	</div>
		83
		84	<button type="Submit" class="btn">Save</button>
71	</fieldset>	85	</fieldset>
72	</form>	86	</form>
73	<h2>Immediate deletion</h2>	87	<h2>Immediate deletion</h2>

Lines 35-41 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt (-2 / +19 lines)
35	</div>	35	</div>
36	<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">	36	<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
37	<input type="hidden" name="op" value="update_privacy" />	37	<input type="hidden" name="op" value="update_privacy" />
38	<label for:"privacy">Please choose your privacy rule:</label>	38
		39	<label for="privacy">Please choose your privacy rule:</label>
39	<select name="privacy">	40	<select name="privacy">
40	[% IF ( privacy0 ) %]	41	[% IF ( privacy0 ) %]
41	<option value="0" selected="1" class="privacy0">Forever</option>	42	<option value="0" selected="1" class="privacy0">Forever</option>
Lines 53-59 Link Here
53	<option value="2" class="privacy2">Never</option>	54	<option value="2" class="privacy2">Never</option>
54	[% END %]	55	[% END %]
55	</select>	56	</select>
56	<input type="Submit" value="Submit" />	57
		58	<p/>
		59
		60	<label for="privacy_relative_checkouts">Allow relatives to view your current checkouts?</label>
		61	<select name="privacy_relative_checkouts">
		62	[% IF borrower.privacy_relative_checkouts %]
		63	<option value="0">No</option>
		64	<option value="1" selected>Yes</option>
		65	[% ELSE %]
		66	<option value="0" selected>No</option>
		67	<option value="1">Yes</option>
		68	[% END %]
		69	</select>
		70
		71	<p/>
		72
		73	<input type="Submit" value="Save" />
57	</form>	74	</form>
58	<h2>Immediate deletion</h2>	75	<h2>Immediate deletion</h2>
59	<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">	76	<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">