---
.../prog/en/modules/members/memberentrygen.tmpl | 26 +++++++++++--------
members/memberentry.pl | 2 +
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index b21d35a..59d159a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -732,22 +732,26 @@
<label for="categorycode">Category: </label>
<select id="categorycode" name="categorycode">
<!-- TMPL_LOOP NAME="typeloop" -->
- <!-- TMPL_IF EXPR="typename eq 'C'" --><optgroup
label="Child"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'A'" --><optgroup
label="Adult"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'S'" --><optgroup
label="Staff"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'I'" --><optgroup
label="Organization"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'P'" --><optgroup
label="Professional"><!-- /TMPL_IF -->
- <!-- TMPL_IF EXPR="typename eq 'X'" --><optgroup
label="Statistical"><!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME="categoryloop" -->
+ <!-- TMPL_LOOP NAME="categoryloop" -->
+ <!-- TMPL_IF NAME="__first__" -->
+ <!-- TMPL_IF NAME="typename_C"
--><optgroup label="Child"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="typename_A"
--><optgroup label="Adult"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="typename_S"
--><optgroup label="Staff"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="typename_I"
--><optgroup label="Organization"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="typename_P"
--><optgroup label="Professional"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="typename_X"
--><optgroup label="Statistical"><!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="categorycodeselected" -->
<option value="<!-- TMPL_VAR NAME="categorycode" -->"
selected="selected"><!-- TMPL_VAR NAME="categoryname" --></option>
<!-- TMPL_ELSE -->
<option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR
NAME="categoryname" --></option>
<!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </optgroup>
- <!-- /TMPL_LOOP -->
- </select>
+ <!-- TMPL_IF NAME="__last__" -->
+ </optgroup>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </select>
<!-- TMPL_ELSE -->
<span class="problem">There is no category type to add <!--TMPL_IF
Name="A"-->an Adult<!--/TMPL_IF--><!--TMPL_IF Name="C"-->a
Child<!--/TMPL_IF--><!--TMPL_IF Name="I"-->an
Institution<!--/TMPL_IF--><!--TMPL_IF Name="P"-->a
professionnal<!--/TMPL_IF--><!--TMPL_IF Name="S"-->a Staff
Member<!--/TMPL_IF-->.</span>
<a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 6ec6d8e..7216484 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -429,8 +429,10 @@ foreach (qw(C A S P I X)) {
}
my %typehash;
$typehash{'typename'}=$_;
+ my $typedescription = "typename_".$typehash{'typename'};
$typehash{'categoryloop'}...@categoryloop;
push @typeloop,{'typename' => $_,
+ $typedescription => 1,
'categoryloop' => \...@categoryloop};
}
$template->param('typeloop' => \...@typeloop);
--
1.7.0.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
