vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix hiding/showing resolution on attachment create form, on bug create form

master
Vitaliy Filippov 2014-05-22 01:05:03 +04:00
parent 74ec807280
commit b0175d8bac
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/enter_bug.js
View File

@ -131,18 +131,11 @@ function handleWantsAttachment(wants_attachment)
function bug_status_change() 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 = ''; document.Create.assigned_to.value = current_user_login;
}
else
{
if (this.value == "ASSIGNED")
{
document.Create.assigned_to.value = current_user_login;
}
document.getElementById('resolution_container').style.display = 'none';
document.Create.resolution.value = '';
} }
} }

8
js/field.js
View File

@ -164,8 +164,8 @@ function showHideStatusItems(is_duplicate, initial_status)
var resolution = document.getElementById('resolution'); var resolution = document.getElementById('resolution');
addClass('duplicate_display', 'bz_default_hidden'); addClass('duplicate_display', 'bz_default_hidden');
showDuplicateItem(el); showDuplicateItem(el);
if (el.options[el.selectedIndex].text == initial_status && is_duplicate == "is_duplicate" || if (el.options[el.selectedIndex].value == initial_status && is_duplicate == "is_duplicate" ||
bz_isValueInArray(close_status_array, el.options[el.selectedIndex].text)) bz_isValueInArray(close_status_array, el.options[el.selectedIndex].value))
{ {
removeClass('resolution_settings', 'bz_default_hidden'); removeClass('resolution_settings', 'bz_default_hidden');
removeClass('resolution_settings_warning', 'bz_default_hidden'); removeClass('resolution_settings_warning', 'bz_default_hidden');
@ -208,8 +208,8 @@ function showDuplicateItem(e)
if (resolution && dup_id) if (resolution && dup_id)
{ {
// FIXME remove name hardcode // FIXME remove name hardcode
if (resolution.options[resolution.selectedIndex].text == 'DUPLICATE' && if (resolution.options[resolution.selectedIndex].value == 'DUPLICATE' &&
bz_isValueInArray(close_status_array, bug_status.options[bug_status.selectedIndex].text)) bz_isValueInArray(close_status_array, bug_status.options[bug_status.selectedIndex].value))
{ {
// hide resolution show duplicate // hide resolution show duplicate
removeClass('duplicate_settings', 'bz_default_hidden'); removeClass('duplicate_settings', 'bz_default_hidden');

4
template/en/default/attachment/create.html.tmpl
View File

@ -117,9 +117,7 @@
} }
addListener('bug_status', 'change', onchange_bug_status); addListener('bug_status', 'change', onchange_bug_status);
addListener('resolution', 'change', showDuplicateItem); addListener('resolution', 'change', showDuplicateItem);
addListener(window, 'load', function() { addListener(window, 'load', onchange_bug_status);
showHideStatusItems('[% "is_duplicate" IF bug.dup_id %]', '[% bug.bug_status_obj.name | js %]');
});
</script> </script>
[% IF bug.check_can_change_field('dup_id', 0, 1) %] [% IF bug.check_can_change_field('dup_id', 0, 1) %]

11
template/en/default/bug/create/create.html.tmpl
View File

@ -50,6 +50,15 @@ var component_data = [% json(components_json) %];
var wantsReminder = [% Bugzilla.user.wants_worktime_reminder('new bug') ? 'true' : 'false' %]; var wantsReminder = [% Bugzilla.user.wants_worktime_reminder('new bug') ? 'true' : 'false' %];
var noTimeTracking = [% product.notimetracking ? '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> </script>
@ -203,7 +212,7 @@ var noTimeTracking = [% product.notimetracking ? 'true' : 'false' %];
[% END %] [% END %]
</tr> </tr>
<tr id="resolution_container" style="display:none"> <tr id="resolution_settings" class="bz_default_hidden">
[% INCLUDE bug/field.html.tmpl [% INCLUDE bug/field.html.tmpl
bug = default bug = default
field = select_fields.resolution field = select_fields.resolution