diff options
| author | Byron Jones <bjones@mozilla.com> | 2012-10-16 09:13:48 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2012-10-16 09:13:48 +0200 |
| commit | ddb100352de89b6155a864838e7fa1a26bbbf93c (patch) | |
| tree | ed8b41860eabb4dad4964700ba15d4c44ff6aef9 | |
| parent | fa48b7a2e8a395b84076d20a0965a31ce6d130ee (diff) | |
| download | bugzilla-ddb100352de89b6155a864838e7fa1a26bbbf93c.tar.gz bugzilla-ddb100352de89b6155a864838e7fa1a26bbbf93c.tar.xz | |
Bug 797680: make "reset assignee/qa-contact to default" unchecked if the assignee/qa-contact has changed from defaults
r=LpSolit, r=LpSolit
| -rw-r--r-- | js/field.js | 22 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 8 |
2 files changed, 19 insertions, 11 deletions
diff --git a/js/field.js b/js/field.js index 7d47169d4..c0d0aaa6e 100644 --- a/js/field.js +++ b/js/field.js @@ -336,13 +336,19 @@ function showPeopleOnChange( field_id_list ) { } } -function assignToDefaultOnChange(field_id_list) { - showPeopleOnChange( field_id_list ); - for(var i = 0; i < field_id_list.length; i++) { - YAHOO.util.Event.addListener( field_id_list[i],'change', setDefaultCheckbox, - 'set_default_assignee'); - YAHOO.util.Event.addListener( field_id_list[i],'change',setDefaultCheckbox, - 'set_default_qa_contact'); +function assignToDefaultOnChange(field_id_list, default_assignee, default_qa_contact) { + showPeopleOnChange(field_id_list); + for(var i = 0, l = field_id_list.length; i < l; i++) { + YAHOO.util.Event.addListener(field_id_list[i], 'change', function(evt, defaults) { + if (document.getElementById('assigned_to').value == defaults[0]) { + setDefaultCheckbox(evt, 'set_default_assignee'); + } + if (document.getElementById('qa_contact') + && document.getElementById('qa_contact').value == defaults[1]) + { + setDefaultCheckbox(evt, 'set_default_qa_contact'); + } + }, [default_assignee, default_qa_contact]); } } @@ -439,7 +445,7 @@ function setResolutionToDuplicate(e, duplicate_or_move_bug_status) { YAHOO.util.Event.preventDefault(e); } -function setDefaultCheckbox(e, field_id ) { +function setDefaultCheckbox(e, field_id) { var el = document.getElementById(field_id); var elLabel = document.getElementById(field_id + "_label"); if( el && elLabel ) { diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 0d86f02fa..71afc09dc 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -283,9 +283,6 @@ bug = bug, field = bug_fields.op_sys, no_tds = 1, value = bug.op_sys editable = bug.check_can_change_field('op_sys', 0, 1) %] - <script type="text/javascript"> - assignToDefaultOnChange(['product', 'component']); - </script> </td> </tr> @@ -464,6 +461,11 @@ </td> </tr> [% END %] + <script type="text/javascript"> + assignToDefaultOnChange(['product', 'component'], + '[% bug.component_obj.default_assignee.login FILTER js %]', + '[% bug.component_obj.default_qa_contact.login FILTER js %]'); + </script> [% END %] [%############################################################################%] |