Bugzilla – Attachment 42254 Details for
Bug 13757
Make patron attributes editable in the opac if set to 'editable in OPAC'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13757 - Make patron attributes editable in the OPAC (1/2)
Bug-13757---Make-patron-attributes-editable-in-the.patch (text/plain), 10.44 KB, created by
Jesse Weaver
on 2015-09-02 23:57:13 UTC
(
hide
)
Description:
Bug 13757 - Make patron attributes editable in the OPAC (1/2)
Filename:
MIME Type:
Creator:
Jesse Weaver
Created:
2015-09-02 23:57:13 UTC
Size:
10.44 KB
patch
obsolete
>From 6fbb747d4015660da0171bbdb109661f315487f6 Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Wed, 2 Sep 2015 17:54:04 -0600 >Subject: [PATCH] Bug 13757 - Make patron attributes editable in the OPAC (1/2) > >This patch adds an opac_editable property of borrower attribute types >that can be set in the interface. > >Test plan: > 1. Repeat the following with a new and existing borrower attribute > type: > 2. Verify that "Editable in OPAC" can only be checked if "Display in > OPAC" is checked. > 3. Verify that this new property is correctly saved. >--- > C4/Members/AttributeTypes.pm | 35 +++++++++++++++++----- > admin/patron-attr-types.pl | 8 +++++ > ...d_opac_editable_to_borrower_attribute_types.sql | 1 + > installer/data/mysql/kohastructure.sql | 1 + > .../intranet-tmpl/prog/en/css/staff-global.css | 4 +++ > .../prog/en/modules/admin/patron-attr-types.tt | 16 ++++++++++ > 6 files changed, 57 insertions(+), 8 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_13757-add_opac_editable_to_borrower_attribute_types.sql > >diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm >index 234e1e0..5ec876e 100644 >--- a/C4/Members/AttributeTypes.pm >+++ b/C4/Members/AttributeTypes.pm >@@ -42,6 +42,7 @@ C4::Members::AttributeTypes - mananage extended patron attribute types > $attr_type->repeatable($repeatable); > $attr_type->unique_id($unique_id); > $attr_type->opac_display($opac_display); >+ $attr_type->opac_editable($opac_editable); > $attr_type->password_allowed($password_allowed); > $attr_type->staff_searchable($staff_searchable); > $attr_type->authorised_value_category($authorised_value_category); >@@ -128,6 +129,7 @@ sub new { > $self->{'repeatable'} = 0; > $self->{'unique_id'} = 0; > $self->{'opac_display'} = 0; >+ $self->{'opac_editable'} = 0; > $self->{'password_allowed'} = 0; > $self->{'staff_searchable'} = 0; > $self->{'display_checkout'} = 0; >@@ -170,6 +172,7 @@ sub fetch { > $self->{'repeatable'} = $row->{'repeatable'}; > $self->{'unique_id'} = $row->{'unique_id'}; > $self->{'opac_display'} = $row->{'opac_display'}; >+ $self->{'opac_editable'} = $row->{'opac_editable'}; > $self->{'password_allowed'} = $row->{'password_allowed'}; > $self->{'staff_searchable'} = $row->{'staff_searchable'}; > $self->{'display_checkout'} = $row->{'display_checkout'}; >@@ -211,6 +214,7 @@ sub store { > repeatable = ?, > unique_id = ?, > opac_display = ?, >+ opac_editable = ?, > password_allowed = ?, > staff_searchable = ?, > authorised_value_category = ?, >@@ -220,7 +224,7 @@ sub store { > WHERE code = ?"); > } else { > $sth = $dbh->prepare_cached("INSERT INTO borrower_attribute_types >- (description, repeatable, unique_id, opac_display, password_allowed, >+ (description, repeatable, unique_id, opac_display, opac_editable, password_allowed, > staff_searchable, authorised_value_category, display_checkout, category_code, class, code) > VALUES (?, ?, ?, ?, ?, > ?, ?, ?, ?, ?, ?)"); >@@ -229,13 +233,14 @@ sub store { > $sth->bind_param(2, $self->{'repeatable'}); > $sth->bind_param(3, $self->{'unique_id'}); > $sth->bind_param(4, $self->{'opac_display'}); >- $sth->bind_param(5, $self->{'password_allowed'}); >- $sth->bind_param(6, $self->{'staff_searchable'}); >- $sth->bind_param(7, $self->{'authorised_value_category'}); >- $sth->bind_param(8, $self->{'display_checkout'}); >- $sth->bind_param(9, $self->{'category_code'} || undef); >- $sth->bind_param(10, $self->{'class'}); >- $sth->bind_param(11, $self->{'code'}); >+ $sth->bind_param(5, $self->{'opac_editable'}); >+ $sth->bind_param(6, $self->{'password_allowed'}); >+ $sth->bind_param(7, $self->{'staff_searchable'}); >+ $sth->bind_param(8, $self->{'authorised_value_category'}); >+ $sth->bind_param(9, $self->{'display_checkout'}); >+ $sth->bind_param(10, $self->{'category_code'} || undef); >+ $sth->bind_param(11, $self->{'class'}); >+ $sth->bind_param(12, $self->{'code'}); > $sth->execute; > > if ( defined $$self{branches} ) { >@@ -342,6 +347,20 @@ sub opac_display { > my $self = shift; > @_ ? $self->{'opac_display'} = ((shift) ? 1 : 0) : $self->{'opac_display'}; > } >+=head2 opac_editable >+ >+ my $opac_editable = $attr_type->opac_editable(); >+ $attr_type->opac_editable($opac_editable); >+ >+Accessor. The C<$opac_editable> argument >+is interpreted as a Perl boolean. >+ >+=cut >+ >+sub opac_editable { >+ my $self = shift; >+ @_ ? $self->{'opac_editable'} = ((shift) ? 1 : 0) : $self->{'opac_editable'}; >+} > =head2 password_allowed > > my $password_allowed = $attr_type->password_allowed(); >diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl >index 8ccf927..ac5ed17 100755 >--- a/admin/patron-attr-types.pl >+++ b/admin/patron-attr-types.pl >@@ -119,6 +119,9 @@ sub error_add_attribute_type_form { > if ($input->param('opac_display')) { > $template->param(opac_display_checked => 1); > } >+ if ($input->param('opac_editable')) { >+ $template->param(opac_editable_checked => 1); >+ } > if ($input->param('staff_searchable')) { > $template->param(staff_searchable_checked => 1); > } >@@ -163,6 +166,8 @@ sub add_update_attribute_type { > > my $opac_display = $input->param('opac_display'); > $attr_type->opac_display($opac_display); >+ my $opac_editable = $input->param('opac_editable'); >+ $attr_type->opac_editable($opac_editable); > my $staff_searchable = $input->param('staff_searchable'); > $attr_type->staff_searchable($staff_searchable); > my $authorised_value_category = $input->param('authorised_value_category'); >@@ -248,6 +253,9 @@ sub edit_attribute_type_form { > if ($attr_type->opac_display()) { > $template->param(opac_display_checked => 1); > } >+ if ($attr_type->opac_editable()) { >+ $template->param(opac_editable_checked => 1); >+ } > if ($attr_type->staff_searchable()) { > $template->param(staff_searchable_checked => 1); > } >diff --git a/installer/data/mysql/atomicupdate/bug_13757-add_opac_editable_to_borrower_attribute_types.sql b/installer/data/mysql/atomicupdate/bug_13757-add_opac_editable_to_borrower_attribute_types.sql >new file mode 100644 >index 0000000..76a989f >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_13757-add_opac_editable_to_borrower_attribute_types.sql >@@ -0,0 +1 @@ >+ALTER TABLE borrower_attribute_types ADD COLUMN `opac_editable` tinyint(1) NOT NULL default 0 AFTER `opac_display`; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index fd58258..066f81d 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -290,6 +290,7 @@ CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field > `repeatable` tinyint(1) NOT NULL default 0, -- defines whether one patron/borrower can have multiple values for this custom field (1 for yes, 0 for no) > `unique_id` tinyint(1) NOT NULL default 0, -- defines if this value needs to be unique (1 for yes, 0 for no) > `opac_display` tinyint(1) NOT NULL default 0, -- defines if this field is visible to patrons on their account in the OPAC (1 for yes, 0 for no) >+ `opac_editable` tinyint(1) NOT NULL default 0, -- defines if this field is editable by patrons on their account in the OPAC (1 for yes, 0 for no) > `password_allowed` tinyint(1) NOT NULL default 0, -- defines if it is possible to associate a password with this custom field (1 for yes, 0 for no) > `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no) > `authorised_value_category` varchar(32) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 23066ea..668d4ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -702,6 +702,10 @@ fieldset.action, div.action { > width: auto; > } > >+fieldset.rows li[aria-disabled="true"] { >+ color: #999; >+} >+ > div.rows+div.rows { > margin-top : .6em; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index d2873cd..2ac6d6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -19,6 +19,14 @@ $(document).ready(function() { > if ( $("#branches option:selected").length < 1 ) { > $("#branches option:first").attr("selected", "selected"); > } >+ >+ $("#opac_display").change( function() { >+ if ( this.checked ) { >+ $("#opac_editable").removeAttr('disabled').parent().removeAttr('aria-disabled'); >+ } else { >+ $("#opac_editable").attr('disabled', true).parent().attr('aria-disabled', 'true'); >+ } >+ } ).change(); > } ); > > function DoCancel(f) { >@@ -155,6 +163,14 @@ function CheckAttributeTypeForm(f) { > [% END %] > <span>Check to display this attribute on a patron's details page in the OPAC.</span> > </li> >+ <li><label for="opac_editable">Editable in OPAC: </label> >+ [% IF ( opac_editable_checked ) %] >+ <input type="checkbox" id="opac_editable" name="opac_editable" checked="checked" /> >+ [% ELSE %] >+ <input type="checkbox" id="opac_editable" name="opac_editable" /> >+ [% END %] >+ <span>Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above.)</span> >+ </li> > <li><label for="staff_searchable">Searchable: </label> > [% IF ( staff_searchable_checked ) %] > <input type="checkbox" id="staff_searchable" name="staff_searchable" checked="checked" /> >-- >2.5.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13757
:
42254
|
42626
|
42627
|
47625
|
48040
|
48041
|
48042
|
48043
|
48379
|
48380
|
48381
|
48382
|
56924
|
56925
|
56926
|
56927
|
56928
|
56929
|
57041
|
57042
|
57043
|
57044
|
57045
|
57046
|
58252
|
58253
|
58254
|
58255
|
58351
|
58352
|
58353
|
58354
|
58355
|
58356
|
58357
|
58428
|
58429
|
58581
|
58703
|
58706
|
58707
|
58708
|
58709
|
58710
|
58711
|
58712
|
58713
|
58714
|
58715
|
59376
|
59737
|
59738
|
59739
|
59813
|
59896
|
59897
|
59898
|
60359
|
60360
|
61132
|
61133
|
61134
|
61135
|
61136
|
61137
|
61138
|
61139
|
61140
|
61141
|
61142
|
61143
|
61144
|
61145
|
61146
|
61147
|
61148
|
61149
|
61150
|
61492
|
61493
|
61555
|
61556
|
61557
|
61558
|
61559
|
61560
|
61561
|
61562
|
61563
|
61564
|
61565
|
61566
|
61567
|
61568
|
61569
|
61570
|
61571
|
61572
|
61573
|
61574
|
61575