Attempt to fix #820

This commit is contained in:
kaso17
2016-12-09 17:45:37 +01:00
parent 9862ca408a
commit eaf84e201f
2 changed files with 121 additions and 131 deletions

View File

@@ -1,5 +1,9 @@
var basePath = ''; var basePath = '';
var indexers = [];
var configuredIndexers = [];
var unconfiguredIndexers = [];
$(document).ready(function () { $(document).ready(function () {
$.ajaxSetup({ cache: false }); $.ajaxSetup({ cache: false });
window.jackettIsLocal = window.location.hostname === 'localhost' || window.jackettIsLocal = window.location.hostname === 'localhost' ||
@@ -48,8 +52,9 @@ function loadJackettSettings() {
function reloadIndexers() { function reloadIndexers() {
$('#indexers').hide(); $('#indexers').hide();
var jqxhr = $.get("get_indexers", function (data) { var jqxhr = $.get("get_indexers", function (data) {
var configuredIndexers = []; indexers = data;
var unconfiguredIndexers = []; configuredIndexers = [];
unconfiguredIndexers = [];
for (var i = 0; i < data.items.length; i++) { for (var i = 0; i < data.items.length; i++) {
var item = data.items[i]; var item = data.items[i];
item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id); item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
@@ -513,29 +518,12 @@ function updateReleasesRow(row)
function showSearch(selectedIndexer) { function showSearch(selectedIndexer) {
$('#select-indexer-modal').remove(); $('#select-indexer-modal').remove();
var jqxhr = $.get("get_indexers", function (data) {
var scope = {
items: data.items
};
var indexers = [];
indexers.push({
id: '', name: '-- All --'
});
for (var i = 0; i < data.items.length; i++) {
if (data.items[i].configured === true) {
indexers.push(data.items[i]);
}
}
var releaseTemplate = Handlebars.compile($("#jackett-search").html()); var releaseTemplate = Handlebars.compile($("#jackett-search").html());
var releaseDialog = $(releaseTemplate({ var releaseDialog = $(releaseTemplate({
indexers: indexers indexers: configuredIndexers
})); }));
if (selectedIndexer)
releaseDialog.find("#searchTracker").val(selectedIndexer);
$("#modals").append(releaseDialog); $("#modals").append(releaseDialog);
releaseDialog.modal("show");
releaseDialog.on('shown.bs.modal', function () { releaseDialog.on('shown.bs.modal', function () {
releaseDialog.find('#searchquery').focus(); releaseDialog.find('#searchquery').focus();
@@ -559,11 +547,10 @@ function showSearch(selectedIndexer) {
}); });
}; };
setCategories('', data.items);
$('#searchTracker').change(jQuery.proxy(function () { $('#searchTracker').change(jQuery.proxy(function () {
var trackerId = $('#searchTracker').val(); var trackerId = $('#searchTracker').val();
setCategories(trackerId, this.items); setCategories(trackerId, this.items);
}, scope)); }, { items: configuredIndexers }));
document.getElementById("searchquery") document.getElementById("searchquery")
.addEventListener("keyup", function (event) { .addEventListener("keyup", function (event) {
@@ -656,9 +643,11 @@ function showSearch(selectedIndexer) {
}); });
}); });
}).fail(function () { var searchTracker = releaseDialog.find("#searchTracker");
doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert"); if (selectedIndexer)
}); searchTracker.val(selectedIndexer);
searchTracker.trigger("change");
releaseDialog.modal("show");
} }
function bindUIButtons() { function bindUIButtons() {

View File

@@ -358,6 +358,7 @@
<select name="category" id="searchCategory"></select> <select name="category" id="searchCategory"></select>
<label>Tracker</label> <label>Tracker</label>
<select name="tracker" id="searchTracker"> <select name="tracker" id="searchTracker">
<option value="">-- All --</option>
{{#each indexers}} {{#each indexers}}
<option value="{{id}}">{{name}}</option> <option value="{{id}}">{{name}}</option>
{{/each}} {{/each}}