diff options
| author | Sebastin Santy <sebastinssanty@gmail.com> | 2017-08-21 18:49:26 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2017-08-21 18:49:26 +0200 |
| commit | 293b657da11e7197e90f260dc3e0c118cba126dd (patch) | |
| tree | 3f3ff9b3900f056c7067676ec61320451427581d | |
| parent | cd061f563f3f5132ae99c8896d2515c3b594a432 (diff) | |
| download | bugzilla-293b657da11e7197e90f260dc3e0c118cba126dd.tar.gz bugzilla-293b657da11e7197e90f260dc3e0c118cba126dd.tar.xz | |
Bug 1390225 - Make general/untriaged component as default, if available
| -rw-r--r-- | extensions/BugModal/web/new_bug.css | 9 | ||||
| -rw-r--r-- | extensions/BugModal/web/new_bug.js | 30 | ||||
| -rw-r--r-- | template/en/default/bug/new_bug.html.tmpl | 5 |
3 files changed, 37 insertions, 7 deletions
diff --git a/extensions/BugModal/web/new_bug.css b/extensions/BugModal/web/new_bug.css index 8a161bb9a..9264d9b38 100644 --- a/extensions/BugModal/web/new_bug.css +++ b/extensions/BugModal/web/new_bug.css @@ -49,3 +49,12 @@ .file-container { padding: 8px; } + +#comp_change { + float: right; + display: none; +} + +#component_wrap { + display: inline-block; +} diff --git a/extensions/BugModal/web/new_bug.js b/extensions/BugModal/web/new_bug.js index 7298b1d20..f3551f5c8 100644 --- a/extensions/BugModal/web/new_bug.js +++ b/extensions/BugModal/web/new_bug.js @@ -13,22 +13,32 @@ var component_load = function(product) { $('#product-throbber').hide(); $('#component').attr('disabled', false); $('#comp_desc').text('Select a component to read its description.'); - var selectize = $("#component")[0].selectize; + var selectize = $("#version")[0].selectize; selectize.clear(); selectize.clearOptions(); selectize.load(function(callback) { - callback(data.components) + callback(data.versions); }); - for (var i in data.components) - comp_desc[data.components[i]["name"]] = data.components[i]["description"]; - - selectize = $("#version")[0].selectize; + selectize = $("#component")[0].selectize; selectize.clear(); selectize.clearOptions(); selectize.load(function(callback) { - callback(data.versions); + callback(data.components) }); + selectize.enable(); + $('#comp_change').css('display', 'none'); + + for (component in data.components) { + if (data.components[component].name.toLowerCase() === "untriaged" || data.components[component].name.toLowerCase() === "general") { + selectize.setValue(data.components[component].name, false); + selectize.disable(); + $('#comp_change').css('display', 'inline-block'); + } + } + + for (var i in data.components) + comp_desc[data.components[i]["name"]] = data.components[i]["description"]; }, function() { alert("Network issues. Please refresh the page and try again"); @@ -106,6 +116,12 @@ $(document).ready(function() { component_load($("#product").val()); }); + $('#comp_change').on("click", function () { + selectize = $("#component")[0].selectize; + selectize.enable(); + $('#comp_change').css('display', 'none'); + }) + component_sel.on("change", function () { var selectize = $("#component")[0].selectize; $('#comp_desc').text(comp_desc[selectize.getValue()]); diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index bed0c5578..631b9e6d5 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -122,6 +122,7 @@ [% END %] [%# component %] + <div id="component_wrap" style="display:inline-block"> [% WRAPPER bug_modal/field.html.tmpl field = bug_fields.component field_type = constants.FIELD_TYPE_SINGLE_SELECT @@ -144,6 +145,10 @@ </div> </span> [% END %] + </div> + <div id="comp_change"> + <sup><a>Change</a></sup> + </div> [% INCLUDE bug_modal/field.html.tmpl field = bug_fields.version |