Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-06 23:55:55 +02:00
Code Issues Packages Projects Releases Activity

Don't preload all query filters (#24787).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16170 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-09 19:59:54 +00:00
parent 72f5919252
commit fd3c08aaa1
11 changed files with 249 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/javascripts/application.js
View File

@@ -120,6 +120,18 @@ function initFilters() {
function addFilter(field, operator, values) {
var fieldId = field.replace('.', '_');
var tr = $('#tr_'+fieldId);
var filterOptions = availableFilters[field];
if (!filterOptions) return;
if (filterOptions['remote'] && filterOptions['values'] == null) {
$.getJSON(filtersUrl, {'name': field}).done(function(data) {
filterOptions['values'] = data;
addFilter(field, operator, values) ;
});
return;
}
if (tr.length > 0) {
tr.show();
} else {
@@ -134,7 +146,7 @@ function addFilter(field, operator, values) {
});
}
function buildFilterRow(field, operator, values) {
function buildFilterRow(field, operator, values, loadedValues) {
var fieldId = field.replace('.', '_');
var filterTable = $("#filters-table");
var filterOptions = availableFilters[field];
@@ -212,8 +224,8 @@ function buildFilterRow(field, operator, values) {
);
$('#values_'+fieldId).val(values[0]);
select = tr.find('td.values select');
for (i = 0; i < allProjects.length; i++) {
var filterValue = allProjects[i];
for (i = 0; i < filterValues.length; i++) {
var filterValue = filterValues[i];
var option = $('<option>');
option.val(filterValue[1]).text(filterValue[0]);
if (values[0] == filterValue[1]) { option.attr('selected', true); }