diff options
| -rw-r--r-- | js/field.js | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/js/field.js b/js/field.js index 700c1de8d..1300e1c53 100644 --- a/js/field.js +++ b/js/field.js @@ -267,6 +267,15 @@ function showHideStatusItems(e, dupArrayInfo) { // finish doing stuff based on the selection. if ( el ) { showDuplicateItem(el); + + // Make sure that fields whose visibility or values are controlled + // by "resolution" behave properly when resolution is hidden. + var resolution = document.getElementById('resolution'); + if (resolution && resolution.options[0].value != '') { + var emptyOption = new Option('', ''); + resolution.insertBefore(emptyOption, resolution.options[0]); + emptyOption.selected = true; + } YAHOO.util.Dom.addClass('resolution_settings', 'bz_default_hidden'); if (document.getElementById('resolution_settings_warning')) { YAHOO.util.Dom.addClass('resolution_settings_warning', @@ -274,18 +283,24 @@ function showHideStatusItems(e, dupArrayInfo) { } YAHOO.util.Dom.addClass('duplicate_display', 'bz_default_hidden'); - if ( el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate" ) { - YAHOO.util.Dom.removeClass('resolution_settings', - 'bz_default_hidden'); - YAHOO.util.Dom.removeClass('resolution_settings_warning', - 'bz_default_hidden'); - } - else if ( bz_isValueInArray(close_status_array, el.value) ) { - // hide duplicate and show resolution + + if ( (el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate") + || bz_isValueInArray(close_status_array, el.value) ) + { YAHOO.util.Dom.removeClass('resolution_settings', 'bz_default_hidden'); YAHOO.util.Dom.removeClass('resolution_settings_warning', 'bz_default_hidden'); + + // Remove the blank option we inserted. + if (resolution && resolution.options[0].value == '') { + resolution.removeChild(resolution.options[0]); + resolution.options[0].selected = true; + } + } + + if (resolution) { + bz_fireEvent(resolution, 'change'); } } } |