Only display the external ID if it is in use

2 files changed, 23 insertions, 13 deletions

diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index 0b3c46eef..2dbee7451 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -35,21 +35,29 @@
    {name               => 'realname'
     heading            => 'Real name'
    }
-   {name               => 'extern_id'
-    heading            => 'External ID'
-   }
-   {name               => 'last_seen_date'
-    heading            => 'Last Login'
-   }
-   {heading            => 'Account History'
-    content            => 'View'
-    contentlink        => 'editusers.cgi?action=activity' _
-                                  '&userid=%%userid%%' _
-                                  listselectionurlparams
-   }
   ]
 %]
 
+[% IF default_authorizer.extern_id_used %]
+  [% columns.push({name    => 'extern_id'
+                   heading => 'External ID'
+                  }
+                 )
+  %]
+[% END %]
+
+[% columns.push({name        => 'last_seen_date'
+                 heading     => 'Last Login'
+                }
+                {heading     => 'Account History'
+                 content     => 'View'
+                 contentlink => 'editusers.cgi?action=activity' _
+                                '&userid=%%userid%%' _
+                                listselectionurlparams
+                }
+               )
+%]
+
 [% IF Param('allowuserdeletion') && editusers %]
   [% columns.push({heading     => 'Action'
                    content     => 'Delete'
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index f62148df2..da61a8a01 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -32,7 +32,9 @@
   <option value="login_name">login name</option>
   <option value="realname">real name</option>
   <option value="userid">user id</option>
-  <option value="extern_id">external id</option>
+  [% IF default_authorizer.extern_id_used %]
+    <option value="extern_id">external id</option>
+  [% END %]
 </select>
 <label for="matchstr">matching</label>
 <input size="32" name="matchstr" id="matchstr" autofocus>