Fix hiding/showing resolution on attachment create form, on bug create form
parent
74ec807280
commit
b0175d8bac
|
@ -131,18 +131,11 @@ function handleWantsAttachment(wants_attachment)
|
|||
|
||||
function bug_status_change()
|
||||
{
|
||||
if (this.value == "RESOLVED")
|
||||
showHideStatusItems();
|
||||
// FIXME Remove hardcode bug_status==ASSIGNED => assign to self
|
||||
if (this.value == "ASSIGNED")
|
||||
{
|
||||
document.getElementById('resolution_container').style.display = '';
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.value == "ASSIGNED")
|
||||
{
|
||||
document.Create.assigned_to.value = current_user_login;
|
||||
}
|
||||
document.getElementById('resolution_container').style.display = 'none';
|
||||
document.Create.resolution.value = '';
|
||||
document.Create.assigned_to.value = current_user_login;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -164,8 +164,8 @@ function showHideStatusItems(is_duplicate, initial_status)
|
|||
var resolution = document.getElementById('resolution');
|
||||
addClass('duplicate_display', 'bz_default_hidden');
|
||||
showDuplicateItem(el);
|
||||
if (el.options[el.selectedIndex].text == initial_status && is_duplicate == "is_duplicate" ||
|
||||
bz_isValueInArray(close_status_array, el.options[el.selectedIndex].text))
|
||||
if (el.options[el.selectedIndex].value == initial_status && is_duplicate == "is_duplicate" ||
|
||||
bz_isValueInArray(close_status_array, el.options[el.selectedIndex].value))
|
||||
{
|
||||
removeClass('resolution_settings', 'bz_default_hidden');
|
||||
removeClass('resolution_settings_warning', 'bz_default_hidden');
|
||||
|
@ -208,8 +208,8 @@ function showDuplicateItem(e)
|
|||
if (resolution && dup_id)
|
||||
{
|
||||
// FIXME remove name hardcode
|
||||
if (resolution.options[resolution.selectedIndex].text == 'DUPLICATE' &&
|
||||
bz_isValueInArray(close_status_array, bug_status.options[bug_status.selectedIndex].text))
|
||||
if (resolution.options[resolution.selectedIndex].value == 'DUPLICATE' &&
|
||||
bz_isValueInArray(close_status_array, bug_status.options[bug_status.selectedIndex].value))
|
||||
{
|
||||
// hide resolution show duplicate
|
||||
removeClass('duplicate_settings', 'bz_default_hidden');
|
||||
|
|
|
@ -117,9 +117,7 @@
|
|||
}
|
||||
addListener('bug_status', 'change', onchange_bug_status);
|
||||
addListener('resolution', 'change', showDuplicateItem);
|
||||
addListener(window, 'load', function() {
|
||||
showHideStatusItems('[% "is_duplicate" IF bug.dup_id %]', '[% bug.bug_status_obj.name | js %]');
|
||||
});
|
||||
addListener(window, 'load', onchange_bug_status);
|
||||
</script>
|
||||
|
||||
[% IF bug.check_can_change_field('dup_id', 0, 1) %]
|
||||
|
|
|
@ -50,6 +50,15 @@ var component_data = [% json(components_json) %];
|
|||
var wantsReminder = [% Bugzilla.user.wants_worktime_reminder('new bug') ? 'true' : 'false' %];
|
||||
var noTimeTracking = [% product.notimetracking ? 'true' : 'false' %];
|
||||
|
||||
[%# FIXME Move close_status_array into "js resource data" %]
|
||||
var close_status_array = [
|
||||
[% SET i = 0 %]
|
||||
[% FOREACH status = Bugzilla.get_field('bug_status').legal_values %]
|
||||
[% NEXT IF status.is_open %]
|
||||
[% ',' IF i; SET i = 1 %]'[% status.name FILTER js %]'
|
||||
[% END %]
|
||||
];
|
||||
|
||||
-->
|
||||
</script>
|
||||
|
||||
|
@ -203,7 +212,7 @@ var noTimeTracking = [% product.notimetracking ? 'true' : 'false' %];
|
|||
[% END %]
|
||||
</tr>
|
||||
|
||||
<tr id="resolution_container" style="display:none">
|
||||
<tr id="resolution_settings" class="bz_default_hidden">
|
||||
[% INCLUDE bug/field.html.tmpl
|
||||
bug = default
|
||||
field = select_fields.resolution
|
||||
|
|
Loading…
Reference in New Issue