[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 6842 - Branch transfer limits broken
Katrin Fischer
Katrin.Fischer.83 at web.de
Tue Sep 20 08:34:50 CEST 2011
From: Owen Leonard <oleonard at myacpl.org>
- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
conflict. It was the addition of the javascript table pager
which broke the functionality on this page.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.
---
admin/branch_transfer_limits.pl | 1 +
.../en/modules/admin/branch_transfer_limits.tt | 12 ++++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index abba127..8c6f42e 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -58,6 +58,7 @@ my @branch_loop;
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my %row =(value => $thisbranch,
branchname => $branches->{$thisbranch}->{'branchname'},
+ selected => $thisbranch eq $branchcode ? 1 : 0,
);
push @branch_loop, \%row;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 5bb5185..2b007bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -71,7 +71,11 @@
<label for="branchselect">Select a library :</label>
<select name="branchcode" id="branchselect">
[% FOREACH branch_loo IN branch_loop %]
+ [% IF ( branch_loo.selected ) %]
+ <option value="[% branch_loo.value %]" selected="selected">[% branch_loo.branchname %]</option>
+ [% ELSE %]
<option value="[% branch_loo.value %]">[% branch_loo.branchname %]</option>
+ [% END %]
[% END %]
</select>
<input type="submit" value="Choose" />
@@ -99,8 +103,8 @@
}).tablesorterPager({container: $("#pager[% codes_loo.code %]table"),positionFixed: false,size: 10});
}); </script>
- <span id="pager[% codes_loo.code %]table" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
+ <div id="pager[% codes_loo.code %]table" class="pager">
+ <p class="formpager"> <strong>page(s)</strong> :
<img src="[% interface %]/[% theme %]/img/first.png" class="first"/>
<img src="[% interface %]/[% theme %]/img/prev.png" class="prev"/>
<input type="text" size="5" class="pagedisplay"/>
@@ -115,8 +119,8 @@
<option value="50">50</option>
<option value="100">100</option>
</select>
- </form>
-</span>
+ </p>
+</div>
<table id="[% codes_loo.code %]table">
<thead>
<tr>
--
1.7.4.1
More information about the Koha-patches
mailing list