Ansprechpersonensuche um PLZ, Ort ergänzt

Und nach Straße, PLZ, Ort sortierbar gemacht

diff --git a/SL/CT.pm b/SL/CT.pm
index fda2353ed2d731a7b368a99da69a159ab9b29731..fabc3cac875a14cc6a76dccbb8e308be8eb67d15 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -1171,7 +1171,7 @@ sub search_contacts {
     'vcnumber'  => 'vcnumber, cp_name, cp_givenname',
     );
 
-  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email vcname vcnumber);
+  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city vcname vcnumber);
 
   my $order_by  = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
   $::form->{sort} = $order_by;

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 56fad897f7b5c85cc4870b88bcbde7f25c685dfe..31c70d0ccfbd6a9ad7afe5695318db8c8036dbb0 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -301,7 +301,7 @@ sub list_contacts {
   my $cvar_configs = CVar->get_configs('module' => 'Contacts');
 
   my @columns      = qw(
-    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_phone1 cp_phone2
+    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2
     cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_birthday cp_gender
   );
 
@@ -327,6 +327,8 @@ sub list_contacts {
     'cp_name'      => { 'text' => $::locale->text('Name'), },
     'cp_givenname' => { 'text' => $::locale->text('Given Name'), },
     'cp_street'    => { 'text' => $::locale->text('Street'), },
+    'cp_zipcode'   => { 'text' => $::locale->text('Zipcode'), },
+    'cp_city'      => { 'text' => $::locale->text('City'), },
     'cp_phone1'    => { 'text' => $::locale->text('Phone1'), },
     'cp_phone2'    => { 'text' => $::locale->text('Phone2'), },
     'cp_mobile1'   => { 'text' => $::locale->text('Mobile1'), },

diff --git a/templates/webpages/ct/search_contact.html b/templates/webpages/ct/search_contact.html
index be678147a6dd5e66d7937e9fc1879679f25300d0..0f7c127144362666dc7b31c640bb37831e39e17b 100644 (file)
--- a/templates/webpages/ct/search_contact.html
+++ b/templates/webpages/ct/search_contact.html
@@ -73,10 +73,20 @@
         <input name="l.cp_givenname" id="l_cp_givenname" type="checkbox" class="checkbox" value="Y" checked>
         <label for="l_cp_givenname">[% 'Given Name' | $T8 %]</label>
        </td>
+      </tr>
+      <tr>
        <td>
         <input name="l.cp_street" id="l_cp_street" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_street">[% 'Street' | $T8 %]</label>
        </td>
+       <td>
+        <input name="l.cp_zipcode" id="l_cp_zipcode" type="checkbox" class="checkbox" value="Y">
+        <label for="l_cp_zipcode">[% 'Zipcode' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l.cp_city" id="l_cp_city" type="checkbox" class="checkbox" value="Y">
+        <label for="l_cp_city">[% 'City' | $T8 %]</label>
+       </td>
       </tr>
       <tr>
        <td>