diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-07-31 22:38:24 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-07-31 22:38:24 +0200 |
| commit | cd61d357d20a973e5ebdf3baeaecd9f38f9a6c7a (patch) | |
| tree | 060cb2e72941a24ff7c53ec064770c50f92ce2ed | |
| parent | f6bafcf4b770f67578a506515c5758380e8b1ab3 (diff) | |
| download | bugzilla-cd61d357d20a973e5ebdf3baeaecd9f38f9a6c7a.tar.gz bugzilla-cd61d357d20a973e5ebdf3baeaecd9f38f9a6c7a.tar.xz | |
Bug 684171 - add a "(take)" link to the QA Contact field
r/a=LpSolit
| -rw-r--r-- | js/field.js | 2 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 41 |
2 files changed, 24 insertions, 19 deletions
diff --git a/js/field.js b/js/field.js index f5376a4f2..caf13217b 100644 --- a/js/field.js +++ b/js/field.js @@ -294,7 +294,7 @@ function checkForChangedFieldValues(e, ContainerInputArray ) { var unhide = false; if ( el ) { if ( el.value != ContainerInputArray[3] || - ( el.value == "" && el.id != "alias") ) { + ( el.value == "" && el.id != "alias" && el.id != 'qa_contact') ) { unhide = true; } else { diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index cc2ce8078..ef45ca252 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -421,36 +421,41 @@ </td> <td> [% IF bug.check_can_change_field("qa_contact", 0, 1) %] - [% IF bug.qa_contact != "" %] - <div id="bz_qa_contact_edit_container" class="bz_default_hidden"> + <div id="bz_qa_contact_edit_container" class="bz_default_hidden"> <span> - <span id="bz_qa_contact_edit_display"> - [% INCLUDE global/user.html.tmpl who = bug.qa_contact %]</span> + [% INCLUDE global/user.html.tmpl who = bug.qa_contact %] (<a href="#" id="bz_qa_contact_edit_action">edit</a>) + [% IF bug.qa_contact.id != user.id %] + (<a title="Change QA contact to yourself" + href="#" id="bz_qa_contact_take_action">take</a>) + [% END %] </span> </div> - [% END %] <div id="bz_qa_contact_input"> [% INCLUDE global/userselect.html.tmpl - id => "qa_contact" - name => "qa_contact" - value => bug.qa_contact.login - size => 30 - classes => ["bz_userfield"] - emptyok => 1 + id => "qa_contact" + name => "qa_contact" + value => bug.qa_contact.login + size => 30 + classes => ["bz_userfield"] + emptyok => 1 %] <br> <input type="checkbox" id="set_default_qa_contact" name="set_default_qa_contact" value="1"> <label for="set_default_qa_contact" id="set_default_qa_contact_label">Reset QA Contact to default</label> </div> <script type="text/javascript"> - [% IF bug.qa_contact != "" %] - hideEditableField('bz_qa_contact_edit_container', - 'bz_qa_contact_input', - 'bz_qa_contact_edit_action', - 'qa_contact', - '[% bug.qa_contact.login FILTER js %]'); - [% END %] + hideEditableField('bz_qa_contact_edit_container', + 'bz_qa_contact_input', + 'bz_qa_contact_edit_action', + 'qa_contact', + '[% bug.qa_contact.login FILTER js %]'); + hideEditableField('bz_qa_contact_edit_container', + 'bz_qa_contact_input', + 'bz_qa_contact_take_action', + 'qa_contact', + '[% bug.qa_contact.login FILTER js %]', + '[% user.login FILTER js %]'); initDefaultCheckbox('qa_contact'); </script> [% ELSE %] |