@@ -, +, @@
---
C4/XSLT.pm | 16 ++++--
installer/data/mysql/en/mandatory/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++
.../prog/en/modules/admin/preferences/opac.pref | 6 ++
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 57 +++++++++++++-------
5 files changed, 63 insertions(+), 24 deletions(-)
--- a/C4/XSLT.pm
+++ a/C4/XSLT.pm
@@ -183,8 +183,10 @@ sub XSLTParse4Display {
sub buildKohaItemsNamespace {
my ($biblionumber) = @_;
my @items = C4::Items::GetItemsInfo($biblionumber);
+ my $shelflocations =GetKohaAuthorisedValues('items.location',GetFrameworkCode($biblionumber), 'opac');
my $branches = GetBranches();
my $itemtypes = GetItemTypes();
+ my $location = "";
my $xml = '';
for my $item (@items) {
my $status;
@@ -223,12 +225,16 @@ sub buildKohaItemsNamespace {
$status = "available";
}
my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'});
- my $itemcallnumber = xml_escape($item->{itemcallnumber});
+ if(C4::Context->preference("OpacItemLocation") && defined $item->{'location'}) {
+ $location = xml_escape($shelflocations->{$item->{location}});
+ }
+ my $itemcallnumber = xml_escape($item->{itemcallnumber});
$xml.= "- $homebranch".
- "$status".
- "".$itemcallnumber.""
- . "
";
-
+ "$location".
+ "$status".
+ "".$itemcallnumber.""
+ . "";
+
}
$xml = "".$xml."";
return $xml;
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ a/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -92,6 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo');
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -4354,6 +4354,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
+$DBversion = 'XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');");
+ print "Upgrade to $DBversion done (Add OpacItemLocation syspref)\n";
+ SetVersion ($DBversion);
+}
+
=head1 FUNCTIONS
=head2 DropAllForeignKeys($table)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -192,6 +192,12 @@ OPAC:
no: "Don't allow"
- patrons to log in to their accounts on the OPAC.
-
+ - pref: OpacItemLocation
+ choices:
+ yes: Show
+ no: "Don't Show"
+ - Show the shelving location of items in opac results.
+ -
- pref: OpacPasswordChange
choices:
yes: Allow
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -979,22 +979,21 @@
()
- No copies available
+ No copies available
-
- Copies available for loan:
-
-
-
- []
- (
-
- )
-. ,
-
+
+
+
+ Copy available for loan at Copies available for loan at
+
+
+
+
+ . ,
+
@@ -1002,15 +1001,14 @@
- Copies available for reference:
-
+
+ Copy available for reference at Copies available for reference at
+
+
- []
- (
-
- )
. ,
@@ -1061,6 +1059,27 @@
).
+
+ Location(s):
+
+
+
+
+ . ,
+
+ |
+
+
+
+
+ . ,
+
+
+
+
+
--