Attachment 28912 Details for Bug 9303 – Bug 9303 [QA Followup 6] - Allow patrons to set visibility from "your personal details"

[patch] Bug 9303 [QA Followup 6] - Allow patrons to set visibility from "your personal details"

Bug-9303-QA-Followup-6---Allow-patrons-to-set-visi.patch (text/plain), 9.35 KB, created by Kyle M Hall (khall) on 2014-06-17 16:29:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-06-17 16:29:30 UTC

Size: 9.35 KB

patch

obsolete

>From 0d2504fe478236db7838e8e6b8cdfb8adaa7e2e4 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 16 Jun 2014 04:52:06 -0400
>Subject: [PATCH] Bug 9303 [QA Followup 6] - Allow patrons to set visibility from "your personal details"
>
>---
> installer/data/mysql/updatedatabase.pl             |   12 +++-
> .../bootstrap/en/modules/opac-memberentry.tt       |   35 +++++++++++
> .../opac-tmpl/prog/en/modules/opac-memberentry.tt  |   35 +++++++++++
> opac/svc/patron/show_checkouts_to_relatives        |   60 ++++++++++++++++++++
> 4 files changed, 140 insertions(+), 2 deletions(-)
> create mode 100755 opac/svc/patron/show_checkouts_to_relatives
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 54df81a..38bb052 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8570,10 +8570,18 @@ if(CheckVersion($DBversion)) {
>         ALTER TABLE deletedborrowers ADD privacy_relative_checkouts BOOLEAN NOT NULL DEFAULT '0'
>     });
>     $dbh->do(q{
>-        ALTER TABLE old_issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
>+        ALTER TABLE old_issues
>+            DROP PRIMARY KEY,
>+            ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST,
>+            DROP INDEX itemnumber_idx,
>+            ADD UNIQUE itemnumber_idx (itemnumber);
>     });
>     $dbh->do(q{
>-        ALTER TABLE issues ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
>+        ALTER TABLE issues
>+            DROP PRIMARY KEY,
>+            ADD issue_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST,
>+            DROP INDEX itemnumber_idx,
>+            ADD UNIQUE itemnumber_idx (itemnumber);
>     });
>     $dbh->do(qq{
>         UPDATE issues SET issue_id = issue_id + ( SELECT COUNT(*) FROM old_issues ) ORDER BY issue_id DESC
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>index 4417171..a070061 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>@@ -54,6 +54,27 @@
>                     <div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
>                 [% END %]
> 
>+                <fieldset class="rows" id="memberentry_privacy">
>+                    <legend id="privacy_legend">Privacy</legend>
>+                    <ol>
>+                        <li>
>+                            <label>Allow relatives to view your current checkouts?</label>
>+                            <select id="privacy_relative_checkouts">
>+                                <option value="0">No</option>
>+                                [% IF borrower.privacy_relative_checkouts %]
>+                                    <option value="1" selected="selected">Yes</option>
>+                                [% ELSE %]
>+                                    <option value="1">Yes</option>
>+                                [% END %]
>+                            </select>
>+                            <span class="hint">
>+                                <a id="update_privacy_relative_checkouts" href="#" class="btn">Update</a>
>+                                <span id="update_privacy_relative_checkouts_message" class="alert" style="display:none"></span>
>+                            </span>
>+                        </li>
>+                    </ol>
>+                </fieldset>
>+
>                 <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
> 
>                 [% UNLESS hidden.defined('branchcode') %]
>@@ -777,6 +798,20 @@
>             [% ELSE %]
>                 $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
>             [% END %]
>+
>+            $('#update_privacy_relative_checkouts').click( function() {
>+                $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_relative_checkouts: $('#privacy_relative_checkouts').val() })
>+                 .done(function( data ) {
>+                     var message;
>+                     if ( data.success ) {
>+                         message = _("Your setting has been updated!");
>+                     } else {
>+                         message = _("Unable to update your setting!");
>+                     }
>+
>+                     $('#update_privacy_relative_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
>+                 });
>+            });
>         });
>     //]]>
>     </script>
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
>index 0e21010..d35706a 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
>@@ -20,6 +20,20 @@
>             [% ELSE %]
>                 $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
>             [% END %]
>+
>+            $('#update_privacy_relative_checkouts').click( function() {
>+                $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_relative_checkouts: $('#privacy_relative_checkouts').val() })
>+                 .done(function( data ) {
>+                     var message;
>+                     if ( data.success ) {
>+                         message = _("Your setting has been updated!");
>+                     } else {
>+                         message = _("Unable to update your setting!");
>+                     }
>+
>+                     $('#update_privacy_relative_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
>+                 });
>+            });
>         });
>     //]]>
>     </script>
>@@ -62,6 +76,27 @@
>                                 <div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
>                             [% END %]
> 
>+                            <fieldset class="rows" id="memberentry_privacy">
>+                                <legend id="privacy_legend">Privacy</legend>
>+                                <ol>
>+                                    <li>
>+                                        <label>Show checkouts to relatives</label>
>+                                        <select id="privacy_relative_checkouts">
>+                                            <option value="0">No</option>
>+                                            [% IF borrower.privacy_relative_checkouts %]
>+                                                <option value="1" selected="selected">Yes</option>
>+                                            [% ELSE %]
>+                                                <option value="1">Yes</option>
>+                                            [% END %]
>+                                        </select>
>+                                        <span class="hint">
>+                                            <button id="update_privacy_relative_checkouts" onclick="return false;">Update</button>
>+                                            <span id="update_privacy_relative_checkouts_message" class="alert" style="display:none"></span>
>+                                        </span>
>+                                    </li>
>+                                </ol>
>+                            </fieldset>
>+
>                                 [% UNLESS
>                                     hidden.defined('branchcode')
>                                 %]
>diff --git a/opac/svc/patron/show_checkouts_to_relatives b/opac/svc/patron/show_checkouts_to_relatives
>new file mode 100755
>index 0000000..8e26c52
>--- /dev/null
>+++ b/opac/svc/patron/show_checkouts_to_relatives
>@@ -0,0 +1,60 @@
>+#!/usr/bin/perl
>+
>+# Copyright 2014 ByWater Solutions
>+#
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it under the
>+# terms of the GNU General Public License as published by the Free Software
>+# Foundation; either version 3 of the License, or (at your option) any later
>+# version.
>+#
>+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
>+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
>+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License along
>+# with Koha; if not, write to the Free Software Foundation, Inc.,
>+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>+
>+use Modern::Perl;
>+
>+use CGI;
>+
>+use C4::Auth;
>+use C4::Context;
>+use Koha::Database;
>+
>+use JSON qw( to_json );
>+
>+my $cgi = CGI->new();
>+
>+my $privacy_relative_checkouts = $cgi->param('privacy_relative_checkouts');
>+
>+my ( $userid, $cookie, $sessionID, $flags ) = checkauth( $cgi, 1, {}, 'opac' );
>+
>+my $borrowernumber =
>+  C4::Context->userenv ? C4::Context->userenv->{number} : undef;
>+
>+my $success = 0;
>+if ( $borrowernumber && defined($privacy_relative_checkouts) ) {
>+    my $patron =
>+      Koha::Database->new()->schema()->resultset('Borrower')
>+      ->find($borrowernumber);
>+
>+    $success = $patron->update(
>+        { privacy_relative_checkouts => $privacy_relative_checkouts } );
>+}
>+
>+binmode STDOUT, ":encoding(UTF-8)";
>+print $cgi->header(
>+    -type    => 'application/json',
>+    -charset => 'UTF-8'
>+);
>+
>+print to_json(
>+    {
>+        success => $success ? 1 : 0,
>+        privacy_relative_checkouts => $privacy_relative_checkouts,
>+    }
>+);
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 9303: 22757 | 22770 | 22771 | 22772 | 22783 | 22789 | 22790 | 22809 | 22966 | 22967 | 22968 | 22974 | 22975 | 23086 | 23087 | 23088 | 23089 | 23090 | 23525 | 23526 | 23527 | 24009 | 24010 | 24011 | 24773 | 24774 | 24775 | 24776 | 25008 | 25584 | 25585 | 25586 | 27537 | 27538 | 27539 | 27540 | 27541 | 27542 | 27543 | 27698 | 27699 | 28153 | 28154 | 28155 | 28156 | 28157 | 28158 | 28159 | 28160 | 28161 | 28912 | 29171 | 29172 | 29215 | 29286 | 29287 | 29288 | 29289 | 29290 | 29299 | 29302 | 29303 | 29304 | 29932 | 29933 | 29934 | 29935 | 29936 | 29937 | 30287 | 30288 | 30289 | 30297 | 30298 | 30299 | 30300 | 32053 | 32054 | 32055 | 33049 | 34629 | 34630 | 34631 | 34632 | 34633 | 35519 | 35520 | 35521 | 35522 | 35523 | 35524 | 35525 | 35526 | 35527 | 35528 | 35529 | 35530 | 35531 | 35532 | 35678 | 35679 | 35680 | 35681 | 35682 | 35683 | 35684 | 35686 | 35687 | 35688 | 35689 | 35690 | 35691 | 35832 | 36287 | 36288 | 36289 | 37110 | 37111 | 37112 | 38264 | 38265 | 38266 | 38267 | 38328 | 38329 | 38330 | 38331 | 38446 | 38447 | 38448 | 38449 | 38450 | 38820 | 38821 | 38822 | 38823 | 38824 | 39042 | 39043 | 39044 | 39045 | 39046 | 39047 | 39048 | 39811 | 39817 | 39818 | 39819 | 39820 | 39821 | 39822 | 39823 | 44430 | 44431 | 44432 | 44433 | 44434 | 44435 | 44436 | 44511 | 44512 | 44513 | 44514 | 44515 | 44516 | 44517 | 46136 | 46137 | 46138 | 46139 | 46140 | 46141 | 46142