Bei Wechsel Ansprechpartner Drop-Down-Boxen für Titel/Abteilung zurücksetzen

Fix für Bug 1311.

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 7fe6afa6407ddfcfaf974a76b000510f3d2a1f2a..9488ec84786973353c831d4617ad5b2eebb05a30 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -654,8 +654,7 @@ sub get_shipto {
   my %myconfig = %main::myconfig;
 
   CT->get_shipto(\%myconfig, \%$form);
   my %myconfig = %main::myconfig;
 
   CT->get_shipto(\%myconfig, \%$form);

-  print $form->ajax_response_header(),  join '__pjx__', map $form->{"shipto$_"},
-    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
+  print $form->ajax_response_header(), join('__pjx__', map($form->{"shipto$_"}, qw(name department_1 department_2 street zipcode city country contact phone fax email used)));

   $main::lxdebug->leave_sub();
 
 }
   $main::lxdebug->leave_sub();
 
 }

diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 2cf95adc946bacd53d9a5e9dc35603608677050f..42b36e5c27379ce7e7cb663e83f95c2a76a2febf 100644 (file)
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -363,7 +363,7 @@
              name       = 'cp_id',
              id         = 'cp_id',
              DATA       = CONTACTS,
              name       = 'cp_id',
              id         = 'cp_id',
              DATA       = CONTACTS,

-             onChange   = "get_contact(['cp_id__'+this.value],['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2','cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender])",
+             onChange   = "on_contact_changed()",

              id_key     = 'cp_id',
              label_sub  = 'contacts_label',
        -%]
              id_key     = 'cp_id',
              label_sub  = 'contacts_label',
        -%]


@@ -387,6 +387,7 @@
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_title',
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_title',

+             id         = 'selected_cp_title',

              DATA       = MB_TITLES,
              show_empty = 1,
              id_key     = 'id',
              DATA       = MB_TITLES,
              show_empty = 1,
              id_key     = 'id',


@@ -401,6 +402,7 @@
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_abteilung',
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_abteilung',

+             id         = 'selected_cp_abteilung',

              DATA       = MB_DEPARTMENT,
              show_empty = 1,
              id_key     = 'id',
              DATA       = MB_DEPARTMENT,
              show_empty = 1,
              id_key     = 'id',


@@ -633,6 +635,7 @@
 
   </div>
 
 
   </div>
 

+  <script type="text/javascript" src="js/jquery.js"></script>

   <script type="text/javascript">
    <!--
    function set_gender(gender) {
   <script type="text/javascript">
    <!--
    function set_gender(gender) {


@@ -641,9 +644,14 @@
        s.selectedIndex = (gender == 'f') ? 1 : 0;
      }
    }
        s.selectedIndex = (gender == 'f') ? 1 : 0;
      }
    }

+
+   function on_contact_changed() {
+     get_contact(['cp_id__' + $('#cp_id').attr('value')],
+                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
+                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
+     $('#selected_cp_title').attr('selectedIndex', 0);
+     $('#selected_cp_abteilung').attr('selectedIndex', 0);
+   }

   -->
 
   </script>
   -->
 
   </script>

-
-
-

diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index 4c2db99d3b2a66d305266b56c94038035c4e9926..1908225aa1d2720471a9bcd6714fdfe91f7e1740 100644 (file)
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -363,7 +363,7 @@
              name       = 'cp_id',
              id         = 'cp_id',
              DATA       = CONTACTS,
              name       = 'cp_id',
              id         = 'cp_id',
              DATA       = CONTACTS,

-             onChange   = "get_contact(['cp_id__'+this.value],['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2','cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender])",
+             onChange   = "on_contact_changed()",

              id_key     = 'cp_id',
              label_sub  = 'contacts_label',
        -%]
              id_key     = 'cp_id',
              label_sub  = 'contacts_label',
        -%]


@@ -387,6 +387,7 @@
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_title',
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_title',

+             id         = 'selected_cp_title',

              DATA       = MB_TITLES,
              show_empty = 1,
              id_key     = 'id',
              DATA       = MB_TITLES,
              show_empty = 1,
              id_key     = 'id',


@@ -401,6 +402,7 @@
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_abteilung',
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
              name       = 'selected_cp_abteilung',

+             id         = 'selected_cp_abteilung',

              DATA       = MB_DEPARTMENT,
              show_empty = 1,
              id_key     = 'id',
              DATA       = MB_DEPARTMENT,
              show_empty = 1,
              id_key     = 'id',


@@ -633,6 +635,7 @@
 
   </div>
 
 
   </div>
 

+  <script type="text/javascript" src="js/jquery.js"></script>

   <script type="text/javascript">
    <!--
    function set_gender(gender) {
   <script type="text/javascript">
    <!--
    function set_gender(gender) {


@@ -641,9 +644,14 @@
        s.selectedIndex = (gender == 'f') ? 1 : 0;
      }
    }
        s.selectedIndex = (gender == 'f') ? 1 : 0;
      }
    }

+
+   function on_contact_changed() {
+     get_contact(['cp_id__' + $('#cp_id').attr('value')],
+                 ['cp_name','cp_title','cp_givenname','cp_phone1','cp_phone2','cp_email','cp_abteilung','cp_fax','cp_mobile1','cp_mobile2',
+                  'cp_satphone','cp_satfax','cp_project','cp_privatphone','cp_privatemail','cp_birthday',enable_delete_contact,set_gender]);
+     $('#selected_cp_title').attr('selectedIndex', 0);
+     $('#selected_cp_abteilung').attr('selectedIndex', 0);
+   }

   -->
 
   </script>
   -->
 
   </script>

-
-
-