[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 <henridamien.laurent@biblibre.com>
This commit is contained in:
Henri-Damien LAURENT 2009-09-19 23:05:34 +02:00
parent 0eb53bc60f
commit 9b1f2270dc
5 changed files with 8 additions and 12 deletions

View File

@ -35,12 +35,10 @@ function add_member(subscriptionid,borrowernumber){
<table>
<tr>
<th>Name</th>
<th>Location</th>
<th>Add</th>
</tr>
<!-- TMPL_LOOP NAME="memberloop" -->
<tr><td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
<td><!-- TMPL_VAR NAME="streetaddress" --></td>
<td><a onclick="add_member(<!-- TMPL_VAR
NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
<!-- /TMPL_LOOP -->

View File

@ -16,10 +16,10 @@
<tr><td colspan="3"><h3><!-- TMPL_VAR NAME="libraryname" --></h3></td></tr>
<tr><td colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" escape="html" --><br />
<!-- TMPL_VAR NAME="issue" --></td></tr>
<tr><td><b>Name/Location</b></td>
<tr><td><b>Name</b></td>
<td><b>Date Due</b></td></tr>
<!-- TMPL_LOOP NAME="memberloop" -->
<tr><td><b><!-- TMPL_VAR NAME="name" --></b> <!-- TMPL_VAR NAME="location" --></td>
<tr><td><!-- TMPL_VAR NAME="name" --></td>
<td>&nbsp;</td></tr>
<!-- /TMPL_LOOP -->
</table>

View File

@ -32,11 +32,9 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
<table border="0" cellspacing="0" cellpadding="0">
<tr><td style="padding-top: 5px;"><b>List Member:</b></td>
<td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
<tr><th>Name</th>
<th>Location</th></tr>
<tr><th>Name</th></tr>
<!-- TMPL_LOOP NAME="memberloop" -->
<tr><td><!-- TMPL_VAR NAME="name" --></td>
<td><!-- TMPL_VAR NAME="location" --></td></tr>
<tr><td><!-- TMPL_VAR NAME="name" --></td></tr>
<!-- /TMPL_LOOP -->
</table></td></tr>
<tr><td><b>Notes:</b></td>

View File

@ -54,12 +54,10 @@ function search_member(subscriptionid){
<tr><td style="padding-top:5px;"><b>List Member:</b></td>
<td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
<tr><th>Name</th>
<th>Location</th>
<th>Rank</th>
<th>Delete</th></tr>
<!-- TMPL_LOOP NAME="memberloop" -->
<tr><td><!-- TMPL_VAR NAME="name" --></td>
<td><!-- TMPL_VAR NAME="location" --></td>
<td><!-- TMPL_VAR NAME="routingbox" --></td>
<td><a href="/cgi-bin/koha/serials/routing.pl?routingid=<!-- TMPL_VAR NAME="routingid" -->&amp;subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=delete">Delete</a></td></tr>
<!-- /TMPL_LOOP -->
@ -88,4 +86,4 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscr
<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

View File

@ -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",