From 822edb8122f951f9cb4300d64cf117309281a67e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 13 Nov 2015 15:01:28 +0000 Subject: [PATCH] Bug 14544: Fix regression on sending an email from staff The shelfnumber was not filled and result in a software error Can't call method "get_contents" on an undefined value at /home/koha/src/virtualshelves/sendshelf.pl line 74. --- C4/Members.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Members.pm b/C4/Members.pm index e0db026..25615cd 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -42,6 +42,7 @@ use Text::Unaccent qw( unac_string ); use Koha::AuthUtils qw(hash_password); use Koha::Database; +use Module::Load qw( load ); use Module::Load::Conditional qw( can_load ); if ( can_load( modules => { 'Koha::NorwegianPatronDB' => undef } ) ) { load Koha::NorwegianPatronDB, qw( NLUpdateHashedPIN NLEncryptPIN NLSync ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index 6ad8c64..e43cf13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -4,7 +4,7 @@ [% IF op == 'view' %] function sendList(){ - open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); } $(document).ready(function() { -- 2.1.0