diff options
| -rw-r--r-- | extensions/BMO/lib/Data.pm | 1 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl | 832 | ||||
| -rw-r--r-- | extensions/TrackingFlags/Extension.pm | 4 |
3 files changed, 1 insertions, 836 deletions
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm index 63d0eb4ad..8a203259e 100644 --- a/extensions/BMO/lib/Data.pm +++ b/extensions/BMO/lib/Data.pm @@ -169,7 +169,6 @@ our @always_fileable_groups = qw( tamarin-security websites-security webtools-security - winqual-data ); # Mapping of products to their security bits diff --git a/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl deleted file mode 100644 index 524ec6781..000000000 --- a/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl +++ /dev/null @@ -1,832 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham <gerv@gerv.net> - # Ville Skyttä <ville.skytta@iki.fi> - # Shane H. W. Travis <travis@sedsystems.ca> - # Marc Schumann <wurblzap@gmail.com> - # Akamai Technologies <bugzilla-dev@akamai.com> - # Max Kanat-Alexander <mkanat@bugzilla.org> - # Frédéric Buclin <LpSolit@gmail.com> - #%] - -[% PROCESS "global/field-descs.none.tmpl" %] - -[% title = BLOCK %]Enter [% terms.Bug %]: [% product.name FILTER html %][% END %] - -[% PROCESS global/header.html.tmpl - title = title - generate_api_token = 1 - yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ] - style_urls = [ 'skins/standard/attachment.css', - 'skins/standard/enter_bug.css', - 'skins/custom/create_bug.css' ] - javascript_urls = [ "js/attachment.js", "js/util.js", - "js/field.js", "js/TUI.js", "js/bug.js", - "js/create_bug.js" ] - onload = "init();" -%] - -<script type="text/javascript"> -<!-- - -function init() { - set_assign_to(); - hideElementById('attachment_true'); - showElementById('attachment_false'); - showElementById('btn_no_attachment'); - initCrashSignatureField(); - init_take_handler('[% user.login FILTER js %]'); -} - -function initCrashSignatureField() { - var el = document.getElementById('cf_crash_signature'); - if (!el) return; - [% IF cf_crash_signature.length %] - YAHOO.util.Dom.addClass('cf_crash_signature_container', 'bz_default_hidden'); - [% ELSE %] - hideEditableField('cf_crash_signature_container','cf_crash_signature_input', - 'cf_crash_signature_action', 'cf_crash_signature'); - [% END %] -} - -var initialowners = new Array(); -var last_initialowner; -var initialccs = new Array(); -var components = new Array(); -var comp_desc = new Array(); -var flags = new Array(); -[% IF Param("useqacontact") %] - var initialqacontacts = new Array([% product.components.size %]); - var last_initialqacontact; -[% END %] -[% count = 0 %] -[%- FOREACH c = product.components %] - [% NEXT IF NOT c.is_active %] - [% NEXT IF c.name != 'WinQual Reports' %] - components[[% count %]] = "[% c.name FILTER js %]"; - comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]"; - initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]"; - [% flag_list = [] %] - [% FOREACH f = c.flag_types(is_active=>1).bug %] - [% flag_list.push(f.id) %] - [% END %] - [% FOREACH f = c.flag_types(is_active=>1).attachment %] - [% flag_list.push(f.id) %] - [% END %] - flags[[% count %]] = [[% flag_list.join(",") FILTER js %]]; - [% IF Param("useqacontact") %] - initialqacontacts[[% count %]] = "[% c.default_qa_contact.login FILTER js %]"; - [% END %] - - [% SET initial_cc_list = [] %] - [% FOREACH cc_user = c.initial_cc %] - [% initial_cc_list.push(cc_user.login) %] - [% END %] - initialccs[[% count %]] = "[% initial_cc_list.join(', ') FILTER js %]"; - - [% count = count + 1 %] -[%- END %] - -function set_assign_to() { - // Based on the selected component, fill the "Assign To:" field - // with the default component owner, and the "QA Contact:" field - // with the default QA Contact. It also selectively enables flags. - var form = document.Create; - var assigned_to = form.assigned_to.value; - -[% IF Param("useqacontact") %] - var qa_contact = form.qa_contact.value; -[% END %] - - var index = -1; - if (form.component.type == 'select-one') { - index = form.component.selectedIndex; - } else if (form.component.type == 'hidden') { - // Assume there is only one component in the list - index = 0; - } - if (index != -1) { - var owner = initialowners[index]; - var component = components[index]; - if (assigned_to == last_initialowner - || assigned_to == owner - || assigned_to == '') { - form.assigned_to.value = owner; - last_initialowner = owner; - } - - document.getElementById('initial_cc').innerHTML = initialccs[index]; - document.getElementById('comp_desc').innerHTML = comp_desc[index]; - - if (initialccs[index]) { - showElementById('initial_cc_label'); - showElementById('initial_cc'); - } else { - hideElementById('initial_cc_label'); - hideElementById('initial_cc'); - } - - [% IF Param("useqacontact") %] - var contact = initialqacontacts[index]; - if (qa_contact == last_initialqacontact - || qa_contact == contact - || qa_contact == '') { - form.qa_contact.value = contact; - last_initialqacontact = contact; - } - [% END %] - - // First, we disable all flags. Then we re-enable those - // which are available for the selected component. - var inputElements = document.getElementsByTagName("select"); - var inputElement, flagField; - for ( var i=0 ; i<inputElements.length ; i++ ) { - inputElement = inputElements.item(i); - if (inputElement.name.search(/^flag_type-(\d+)$/) != -1) { - var id = inputElement.name.replace(/^flag_type-(\d+)$/, "$1"); - inputElement.disabled = true; - // Also hide the requestee field, if it exists. - inputElement = document.getElementById("requestee_type-" + id); - if (inputElement) - YAHOO.util.Dom.addClass(inputElement.parentNode, 'bz_default_hidden'); - } - } - // Now enable flags available for the selected component. - for (var i = 0; i < flags[index].length; i++) { - flagField = document.getElementById("flag_type-" + flags[index][i]); - // Do not enable flags the user cannot set nor request. - if (flagField && flagField.options.length > 1) { - flagField.disabled = false; - // Re-enabling the requestee field depends on the status - // of the flag. - toggleRequesteeField(flagField, 1); - } - } - } -} - -var status_comment_required = new Array(); -[% FOREACH status = bug_status %] - status_comment_required['[% status.name FILTER js %]'] = - [% status.comment_required_on_change_from() ? 'true' : 'false' %] -[% END %] - -TUI_alternates['expert_fields'] = 'Show Advanced Fields'; -// Hide the Advanced Fields by default, unless the user has a cookie -// that specifies otherwise. -TUI_hide_default('expert_fields'); - ---> -</script> - -<form name="Create" id="Create" method="post" action="post_bug.cgi" - class="enter_bug_form" enctype="multipart/form-data" - onsubmit="return validateEnterBug(this)"> - <input type="hidden" name="product" value="Firefox"> - <input type="hidden" name="component" value="WinQual Reports"> - <input type="hidden" name="token" value="[% token FILTER html %]"> - <input type="hidden" name="groups" value="winqual-data"> - -<table> -<tbody> - <tr> - <td colspan="4"> - [%# Migration note: The following file corresponds to the old Param - # 'entryheaderhtml' - #%] - [% PROCESS 'bug/create/user-message.html.tmpl' %] - </td> - </tr> - - <tr> - <td colspan="2"> - <input type="button" id="expert_fields_controller" - value="Hide Advanced Fields" onClick="toggleAdvancedFields()"> - [%# Show the link if the browser supports JS %] - <script type="text/javascript"> - YAHOO.util.Dom.removeClass('expert_fields_controller', - 'bz_default_hidden'); - </script> - </td> - <td colspan="2"> - (<span class="required_star">*</span> = - <span class="required_explanation">Required Field</span>) - </td> - </tr> - - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.product, editable = 0, - value = product.name %] - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.reporter, editable = 0, - value = user.login %] - </tr> - - [%# We can't use the select block in these two cases for various reasons. %] - <tr> - [% component_desc_url = BLOCK -%] - describecomponents.cgi?product=[% product.name FILTER uri %] - [% END %] - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.component editable = 1 - desc_url = component_desc_url - %] - <td id="field_container_component"> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.component, editable = 0, - value = "WinQual Reports", no_tds = 1 %] - <script type="text/javascript"> - <!-- - [%+ INCLUDE "bug/field-events.js.tmpl" - field = bug_fields.component %] - YAHOO.util.Event.onDOMReady(set_assign_to); - //--> - </script> - </td> - - <td colspan="2" id="comp_desc_container"> - [%# Enclose the fieldset in a nested table so that its width changes based - # on the length on the component description. %] - <table> - <tr> - <td> - <fieldset> - <legend>Component Description</legend> - <div id="comp_desc" class="comment"></div> - </fieldset> - </td> - </tr> - </table> - </td> - </tr> - - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.version editable = 1 rowspan = 3 - %] - <td rowspan="3"> - <select name="version" id="version" size="5"> - [%- FOREACH v = version %] - [% NEXT IF NOT v.is_active %] - <option value="[% v.name FILTER html %]" - [% ' selected="selected"' IF v.name == default.version %]>[% v.name FILTER html -%] - </option> - [%- END %] - </select> - </td> - - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.bug_severity, editable = 1, - value = default.bug_severity %] - </tr> - - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.rep_platform, editable = 1, - value = default.rep_platform %] - </tr> - - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.op_sys, editable = 1, - value = default.op_sys %] - </tr> - [% IF !Param('defaultplatform') || !Param('defaultopsys') %] - <tr> - <th colspan="3"> </th> - <td id="os_guess_note" class="comment"> - <div>We've made a guess at your - [% IF Param('defaultplatform') %] - operating system. Please check it - [% ELSIF Param('defaultopsys') %] - platform. Please check it - [% ELSE %] - operating system and platform. Please check them - [% END %] - and make any corrections if necessary.</div> - </td> - </tr> - [% END %] -</tbody> - -<tbody class="expert_fields"> - <tr> - [% IF Param('usetargetmilestone') && Param('letsubmitterchoosemilestone') %] - [% INCLUDE select field = bug_fields.target_milestone %] - [% ELSE %] - <td colspan="2"> </td> - [% END %] - - [% IF Param('letsubmitterchoosepriority') %] - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.priority, editable = 1, - value = default.priority %] - [% ELSE %] - <td colspan="2"> </td> - [% END %] - </tr> -</tbody> - -<tbody class="expert_fields"> - <tr> - <td colspan="4"> </td> - </tr> - - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.bug_status, - editable = (bug_status.size > 1), value = default.bug_status - override_legal_values = bug_status %] - </tr> - - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.assigned_to editable = 1 - %] - <td> - [% INCLUDE global/userselect.html.tmpl - id => "assigned_to" - name => "assigned_to" - value => assigned_to - disabled => assigned_to_disabled - size => 30 - emptyok => 1 - custom_userlist => assignees_list - %] - [% UNLESS assigned_to_disabled %] - <span id="take_bug"> - (<a title="Assign to yourself" href="#" - onclick="return take_bug('[% user.login FILTER js %]')">take</a>) - </span> - [% END %] - <noscript>(Leave blank to assign to component's default assignee)</noscript> - </td> - -[% IF Param("useqacontact") %] - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.qa_contact editable = 1 - %] - <td> - [% INCLUDE global/userselect.html.tmpl - id => "qa_contact" - name => "qa_contact" - value => qa_contact - disabled => qa_contact_disabled - size => 30 - emptyok => 1 - custom_userlist => qa_contacts_list - %] - <noscript>(Leave blank to assign to default qa contact)</noscript> - </td> - </tr> -[% END %] - - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.cc editable = 1 - %] - <td> - [% INCLUDE global/userselect.html.tmpl - id => "cc" - name => "cc" - value => cc - disabled => cc_disabled - size => 30 - multiple => 5 - %] - </td> - <th> - <span id="initial_cc_label" class="bz_default_hidden"> - Default [% field_descs.cc FILTER html %]: - </span> - </th> - <td> - <span id="initial_cc"></span> - </td> - </tr> - - <tr> - <td colspan="3"> </td> - </tr> - -[% IF Param("usebugaliases") %] - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.alias editable = 1 - %] - <td colspan="2"> - <input name="alias" size="20" value="[% alias FILTER html %]"> - </td> - </tr> -[% END %] -</tbody> - -<tbody> - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.short_desc editable = 1 - %] - <td colspan="3" class="field_value"> - <input name="short_desc" size="70" value="[% short_desc FILTER html %]" - maxlength="255" spellcheck="true" aria-required="true" - class="required text_input" id="short_desc"> - </td> - </tr> - - [% IF feature_enabled('jsonrpc') AND !cloned_bug_id %] - <tr id="possible_duplicates_container" class="bz_default_hidden"> - <th>Possible<br>Duplicates:</th> - <td colspan="3"> - <div id="possible_duplicates"></div> - <script type="text/javascript"> - var dt_columns = [ - { key: "id", label: "[% field_descs.bug_id FILTER js %]", - formatter: YAHOO.bugzilla.dupTable.formatBugLink }, - { key: "summary", - label: "[% field_descs.short_desc FILTER js %]", - formatter: "text" }, - { key: "status", - label: "[% field_descs.bug_status FILTER js %]", - formatter: YAHOO.bugzilla.dupTable.formatStatus }, - { key: "update_token", label: '', - formatter: YAHOO.bugzilla.dupTable.formatCcButton } - ]; - YAHOO.bugzilla.dupTable.addCcMessage = "Add Me to the CC List"; - YAHOO.bugzilla.dupTable.init({ - container: 'possible_duplicates', - columns: dt_columns, - product_name: '[% product.name FILTER js %]', - summary_field: 'short_desc', - options: { - MSG_LOADING: 'Searching for possible duplicates...', - MSG_EMPTY: 'No possible duplicates found.', - SUMMARY: 'Possible Duplicates' - } - }); - </script> - </td> - </tr> - [% END %] - - <tr> - <th>Description:</th> - <td colspan="3"> - - [% defaultcontent = BLOCK %] - [% IF cloned_bug_id %] -+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id FILTER html %] +++ - - - [% END %] - [%-# We are within a BLOCK. The comment will be correctly HTML-escaped - # by global/textarea.html.tmpl. So we must not escape the comment here. %] - [% comment FILTER none %] - [%- END %] - [% INCLUDE global/textarea.html.tmpl - name = 'comment' - id = 'comment' - minrows = 10 - maxrows = 25 - cols = constants.COMMENT_COLS - defaultcontent = defaultcontent - %] - <br> - </td> - </tr> - -<tbody class="expert_fields"> - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.bug_file_loc editable = 1 - %] - <td colspan="3" class="field_value"> - <input name="bug_file_loc" id="bug_file_loc" class="text_input" - size="40" value="[% bug_file_loc FILTER html %]"> - </td> - </tr> -</tbody> - -<tbody> - [% IF Param("maxattachmentsize") %] - <tr> - <th>Attachment:</th> - <td colspan="3"> - <div id="attachment_false" class="bz_default_hidden"> - <input type="button" value="Add an attachment" onClick="handleWantsAttachment(true)"> - </div> - - <div id="attachment_true"> - <input type="button" id="btn_no_attachment" value="Don't add an attachment" - class="bz_default_hidden" onClick="handleWantsAttachment(false)"> - <fieldset> - <legend>Add an attachment</legend> - <table class="attachment_entry"> - [% PROCESS attachment/createformcontents.html.tmpl - flag_types = product.flag_types(is_active=>1).attachment - any_flags_requesteeble = 1 - flag_table_id ="attachment_flags" %] - </table> - - [% IF user.is_insider %] - <input type="checkbox" id="comment_is_private" name="comment_is_private" - [% ' checked="checked"' IF comment_is_private %] - onClick="updateCommentTagControl(this, 'comment')"> - <label for="comment_is_private"> - Make this attachment and [% terms.bug %] description private (visible only - to members of the <strong>[% Param('insidergroup') FILTER html %]</strong> group) - </label> - [% END %] - </fieldset> - </div> - </td> - </tr> - [% END %] -</tbody> - -<tbody class="expert_fields"> - [% IF user.in_group('editbugs', product.id) %] - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.dependson editable = 1 - %] - <td> - <input name="dependson" accesskey="d" value="[% dependson FILTER html %]" size="30"> - </td> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.blocked editable = 1 - %] - <td> - <input name="blocked" accesskey="b" value="[% blocked FILTER html %]" size="30"> - </td> - </tr> - - [% IF use_keywords %] - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.keywords, editable = 1, - value = keywords, desc_url = "describekeywords.cgi", - value_span = 3 - %] - </tr> - [% END %] - - <tr> - <th>Status Whiteboard:</th> - <td colspan="3" class="field_value"> - <input id="status_whiteboard" name="status_whiteboard" size="70" - value="[% status_whiteboard FILTER html %]" class="text_input"> - </td> - </tr> - [% END %] - - [% IF user.is_timetracker %] - <tr> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.estimated_time editable = 1 - %] - <td> - <input name="estimated_time" size="6" maxlength="6" value="[% estimated_time FILTER html %]"> - </td> - [% INCLUDE bug/field.html.tmpl - bug = default, field = bug_fields.deadline, value = deadline, editable = 1 - %] - </tr> - [% END %] -</tbody> - -<tbody> -[%# non-tracking flags custom fields %] -[% FOREACH field = Bugzilla.active_custom_fields(product=>product,type=>1) %] - [% NEXT IF field.type == constants.FIELD_TYPE_EXTENSION %] - [% NEXT UNLESS field.enter_bug %] - [%# crash-signature gets custom handling %] - [% IF field.name == 'cf_crash_signature' %] - [% show_crash_signature = 1 %] - [% NEXT %] - [% END %] - [% SET value = ${field.name}.defined ? ${field.name} : "" %] - <tr [% 'class="expert_fields"' IF !field.is_mandatory %]> - [% INCLUDE bug/field.html.tmpl - bug = default, field = field, value = value, editable = 1, - value_span = 3 %] - </tr> -[% END %] -</tbody> - -[%# crash-signature handling %] -[% IF show_crash_signature %] -<tbody class="expert_fields"> - <tr> - <th id="field_label_cf_crash_signature" class="field_label"> - <label for="cf_crash_signature"> Crash Signature: </label> - </th> - <td colspan="3"> - <span id="cf_crash_signature_container"> - <span id="cf_crash_signature_nonedit_display"><i>None</i></span> - (<a id="cf_crash_signature_action" href="#">edit</a>) - </span> - <span id="cf_crash_signature_input"> - <textarea id="cf_crash_signature" name="cf_crash_signature" rows="4" cols="60" - >[% cf_crash_signature FILTER html %]</textarea> - </span> - </td> - </tr> -</tbody> -[% END %] - -[% old_tracking_flags = [] %] -[% old_project_flags = [] %] -[% FOREACH field = Bugzilla.active_custom_fields(product=>product,type=>2) %] - [% NEXT IF field.type == constants.FIELD_TYPE_EXTENSION %] - [% NEXT UNLESS field.enter_bug %] - [% IF cf_is_project_flag(field.name) %] - [% old_project_flags.push(field) %] - [% ELSE %] - [% old_tracking_flags.push(field) %] - [% END %] -[% END %] - -[% display_flags = 0 %] -[% any_flags_requesteeble = 0 %] -[% FOREACH flag_type = product.flag_types.bug %] - [% display_flags = 1 %] - [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %] - [% LAST IF display_flags && any_flags_requesteeable %] -[% END %] - -[% IF old_project_flags.size || old_tracking_flags.size || display_flags %] - <tbody class="expert_fields"> - <tr> - <th>Flags:</th> - <td colspan="3"> - <div id="bug_flags_false" class="bz_default_hidden"> - <input type="button" value="Set [% terms.bug FILTER html %] flags" onClick="handleWantsBugFlags(true)"> - </div> - - <div id="bug_flags_true"> - <input type="button" id="btn_no_bug_flags" value="Don't set [% terms.bug %] flags" - class="bz_default_hidden" onClick="handleWantsBugFlags(false)"> - - <fieldset> - <legend>Set [% terms.bug %] flags</legend> - - <table cellpadding="0" cellspacing="0"> - <tr> - [% IF old_tracking_flags.size %] - <td [% IF project_flags.size %]rowspan="2"[% END %]> - <table class="tracking_flags"> - <tr> - <th colspan="2" style="text-align:left">Tracking Flags:</th> - </tr> - [% FOREACH field = old_tracking_flags %] - [% SET value = ${field.name}.defined ? ${field.name} : "" %] - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default - field = field - value = value - editable = 1 - value_span = 3 - %] - </tr> - [% END %] - [% Hook.process('tracking_flags_end') %] - </table> - </td> - [% END %] - [% IF old_project_flags.size %] - <td> - <table class="tracking_flags"> - <tr> - <th colspan="2" style="text-align:left">Project Flags:</th> - </tr> - [% FOREACH field = old_project_flags %] - [% SET value = ${field.name}.defined ? ${field.name} : "" %] - <tr> - [% INCLUDE bug/field.html.tmpl - bug = default - field = field - value = value - editable = 1 - value_span = 3 - %] - </tr> - [% END %] - [% Hook.process('project_flags_end') %] - </table> - </td> - </tr> - <tr> - [% END %] - [% IF display_flags %] - <td> - [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug - any_flags_requesteeble = any_flags_requesteeble - flag_table_id = "bug_flags" - %] - </td> - [% END %] - </tr> - [% Hook.process('bug_flags_end') %] - </table> - </fieldset> - </div> - </td> - </tr> - </tbody> -[% END %] - -<tbody> - [%# Form controls for entering additional data about the bug being created. %] - [% Hook.process("form") %] - - <tr> - <th> </th> - <td colspan="3"> - <input type="submit" id="commit" value="Submit [% terms.Bug %]"> - - <input type="submit" name="maketemplate" id="maketemplate" - value="Remember values as bookmarkable template" - onclick="bz_no_validate_enter_bug=true" class="expert_fields"> - </td> - </tr> -</tbody> - [%# "status whiteboard" and "qa contact" are the longest labels - # add them here to avoid shifting the page when toggling advanced fields %] - <tr> - <th class="hidden_text">Status Whiteboard:</th> - <td> </td> - <th class="hidden_text">QA Contact:</th> - </tr> - </table> - <input type="hidden" name="form_name" value="enter_bug"> -</form> - -[%# Links or content with more information about the bug being created. %] -[% Hook.process("end") %] - -<div id="guided"> - <a id="guided_img" href="enter_bug.cgi?format=guided&product=[% product.name FILTER uri %]"><img - src="extensions/BMO/web/images/guided.png" width="16" height="16" border="0" align="absmiddle"></a> - <a id="guided_link" href="enter_bug.cgi?format=guided&product=[% product.name FILTER uri %]" - >Switch to the [% terms.Bugzilla %] Helper</a> -</div> - -[% PROCESS global/footer.html.tmpl %] - -[%############################################################################%] -[%# Block for SELECT fields #%] -[%############################################################################%] - -[% BLOCK select %] - - [% INCLUDE "bug/field-label.html.tmpl" - field = field editable = 1 - %] - <td> - <select name="[% field.name FILTER html %]" - id="[% field.name FILTER html %]"> - [%- FOREACH x = ${field.name} %] - [% NEXT IF NOT x.is_active %] - <option value="[% x.name FILTER html %]" - [% " selected=\"selected\"" IF x.name == default.${field.name} %]> - [% display_value(field.name, x.name) FILTER html %] - </option> - [% END %] - </select> - </td> -[% END %] - -[% BLOCK build_userlist %] - [% user_found = 0 %] - [% default_login = default_user.login %] - [% RETURN UNLESS default_login %] - - [% FOREACH user = userlist %] - [% IF user.login == default_login %] - [% user_found = 1 %] - [% LAST %] - [% END %] - [% END %] - - [% userlist.push({login => default_login, - identity => default_user.identity, - visible => 1}) - UNLESS user_found %] -[% END %] diff --git a/extensions/TrackingFlags/Extension.pm b/extensions/TrackingFlags/Extension.pm index a1b5a0ef6..cc2c55334 100644 --- a/extensions/TrackingFlags/Extension.pm +++ b/extensions/TrackingFlags/Extension.pm @@ -70,9 +70,7 @@ sub template_before_process { my $file = $args->{'file'}; my $vars = $args->{'vars'}; - if ($file eq 'bug/create/create.html.tmpl' - || $file eq 'bug/create/create-winqual.html.tmpl') - { + if ($file eq 'bug/create/create.html.tmpl') { my $flags = Bugzilla::Extension::TrackingFlags::Flag->match({ product => $vars->{'product'}->name, enter_bug => 1, |