summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-07-31 22:57:58 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-07-31 22:57:58 +0200
commitd93a8d2b8433a2ea47a97a6d9cb75408206d9e60 (patch)
tree30c44e623d39ffd4b0e39483120774ddf461126f
parent8ca1cd544e523ae432554717423ac2f4c66f17c6 (diff)
downloadbugzilla-d93a8d2b8433a2ea47a97a6d9cb75408206d9e60.tar.gz
bugzilla-d93a8d2b8433a2ea47a97a6d9cb75408206d9e60.tar.xz
Bug 684171 - add a "(take)" link to the QA Contact field
Upstream accepted so porting over last minor changes
-rw-r--r--js/field.js2
-rw-r--r--template/en/default/bug/edit.html.tmpl5
2 files changed, 4 insertions, 3 deletions
diff --git a/js/field.js b/js/field.js
index ad965f64b..ede2e43b9 100644
--- a/js/field.js
+++ b/js/field.js
@@ -301,7 +301,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 dd19d547a..aac50b7a4 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -506,6 +506,7 @@
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">
@@ -515,12 +516,12 @@
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');