followup on Owen's patron attributes patch

Hide the display of the patron attributes only if
no types are defined; the patron attributes section
(and more importantly, the edit link), should still
be displayed if an attribute type is defined, even
if the patron has no attributes currently set.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 6f52ed7..f42fcaf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -231,7 +231,7 @@ if (nodename =="barcodes[]"){
 <!-- End Upload Patron Image Section -->
 
 <!-- TMPL_IF NAME="ExtendedPatronAttributes" -->
-<!-- TMPL_IF NAME="patron_attributes" -->
+<!-- TMPL_UNLESS NAME="no_patron_attribute_types" -->
 <div id="patron-extended-attributes" style="padding-top: 1em;">
 <h3>Additional attributes and identifiers</h3>
 <table>
@@ -252,7 +252,7 @@ if (nodename =="barcodes[]"){
 </table>
 </div>
 <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=4">Edit</a></div>
-<!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
 <!-- /TMPL_IF -->
 </div>
  <div class="yui-u"> 

diff --git a/members/moremember.pl b/members/moremember.pl
index ae3f82d..b0299f2 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -38,6 +38,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Members;
 use C4::Members::Attributes;
+use C4::Members::AttributeTypes;
 use C4::Dates;
 use C4::Reserves;
 use C4::Circulation;
@@ -340,6 +341,10 @@ $template->param($data);
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     $template->param(ExtendedPatronAttributes => 1);
     $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
+    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
+    if (scalar(@types) == 0) {
+        $template->param(no_patron_attribute_types => 1);
+    }
 }
 
 $template->param(