gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix for 1814: Correcting the way we handle a case where no label batches exist to better inform the user. 

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Chris Nighswonger 2008-02-26 10:24:40 +13:00 committed by Joshua Ferraro
parent 2422dbfb8a
commit 53cdb4ebaa
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C4/Labels.pm
View File

@ -308,10 +308,12 @@ sub get_batches {
}
$sth->finish;
# Not sure why we are doing this rather than simply telling the user that no batches are currently defined.
# So I'm commenting this out and modifying label-manager.tmpl to properly inform the user as stated. -fbcit
# adding a dummy batch=1 value , if none exists in the db
if ( !scalar(@resultsloop) ) {
push( @resultsloop, { batch_id => '1' , num => '0' } );
}
# if ( !scalar(@resultsloop) ) {
# push( @resultsloop, { batch_id => '1' , num => '0' } );
# }
return @resultsloop;
}
@ -852,6 +854,7 @@ my $layout_id = $$conf_data->{'id'};
my $str_fields = get_text_fields($layout_id, 'codes' );
my @fields = split(/ /, $str_fields);
#warn Dumper(@fields);
### @fields
my $vPos = ( $y_pos + ( $label_height - $top_text_margin ) );

7
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
View File

@ -59,7 +59,14 @@ function Plugin(batch_id) {
</div>
</div>
<!-- TMPL_ELSE -->
<div class="yui-g">
<div class="yui-u first">
<h2>No Label Batches Currently Defined</h2>
</div>
<div class="yui-u">
<!-- TMPL_INCLUDE NAME="label-status.inc" -->
</div>
</div>
<!-- /TMPL_IF --><!-- /batches -->
<!-- TMPL_ELSE -->