From 9b1f2270dc6965cd82bbf465e538e77354ae8a34 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Sat, 19 Sep 2009 23:05:34 +0200 Subject: [PATCH] [3.0.x](bug #3563) This replaces the library name by the branchname attached to the subscription, and hide streetaddesses in serials routing In routing-preview, the title should be the branchname attached to the subscription instead of the libraryname. And showing the streetaddress of the members is useless, and harm privacy. Signed-off-by: Henri-Damien LAURENT --- .../prog/en/modules/serials/member-search.tmpl | 2 -- .../prog/en/modules/serials/routing-preview-slip.tmpl | 4 ++-- .../prog/en/modules/serials/routing-preview.tmpl | 6 ++---- .../intranet-tmpl/prog/en/modules/serials/routing.tmpl | 4 +--- serials/routing-preview.pl | 4 +++- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl index 2e61e024b2..7f8d0ecc2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl @@ -35,12 +35,10 @@ function add_member(subscriptionid,borrowernumber){ - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl index 59a94287d8..d55ec7473f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl @@ -16,10 +16,10 @@ - + - +
NameLocation Add
,); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=&borrowernumber=&op=add">Add

Title:
Name/Location
Name Date Due
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl index c3a4e4a174..999b31b309 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl @@ -32,11 +32,9 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl index bbdba1fde1..199828f866 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl @@ -54,12 +54,10 @@ function search_member(subscriptionid){
List Member: - - + - - +
NameLocation
Name
Notes:
List Member: - - @@ -88,4 +86,4 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid= - \ No newline at end of file + diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 19d80f7fdc..ad57782ca4 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -18,6 +18,7 @@ use C4::Biblio; use C4::Items; use C4::Serials; use URI::Escape; +use C4::Branch; my $query = new CGI; my $subscriptionid = $query->param('subscriptionid'); @@ -59,6 +60,7 @@ if($ok){ my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio); my @itemresults = GetItemsInfo($subs->{'biblionumber'}, 'intra'); my $branch = $itemresults[0]->{'holdingbranch'}; + my $branchname = GetBranchName($branch); my $const = 'o'; my $notes; my $title = $subs->{'bibliotitle'}; @@ -84,7 +86,7 @@ if($ok){ flagsrequired => {serials => 1}, debug => 1, }); - $template->param("libraryname"=>C4::Context->preference("LibraryName")); + $template->param("libraryname"=>$branchname); } else { ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/routing-preview.tmpl", -- 2.39.5
NameLocation Rank Delete
&subscriptionid=&op=delete">Delete