corbz/PYRSS-Website
corbz/PYRSS-Website
1
0
Fork 0
Code Issues 21 Pull Requests Actions Releases 1 Wiki Activity

filter algorithm selection no setting properly fix

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-07-11 10:28:10 +01:00
parent 0d3691b782
commit 48743eadd8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/static/js/home/filters.js
View File

@ -86,6 +86,8 @@ async function showEditFilterModal(filterId) {
$("#filterFormModal input, #filterFormModal textarea").val(""); $("#filterFormModal input, #filterFormModal textarea").val("");
$("#filterFormModal input:checkbox").prop("checked", false); $("#filterFormModal input:checkbox").prop("checked", false);
$("#filterAlgorithm").val("").change();
$("#filterFormModal .form-create").show(); $("#filterFormModal .form-create").show();
$("#filterFormModal .form-edit").hide(); $("#filterFormModal .form-edit").hide();
} }
@ -94,8 +96,10 @@ async function showEditFilterModal(filterId) {
return data.id === filterId; return data.id === filterId;
}).data(); }).data();
$("#filterAlgorithm").val("").change();
$("#filterAlgorithm").val(filter.matching_algorithm).change();
$("#filterName").val(filter.name); $("#filterName").val(filter.name);
$("#filterAlgorithm").val(filter.matching_algorithm);
$("#filterMatch").val(filter.match); $("#filterMatch").val(filter.match);
$("#filterWhitelist").prop("checked", filter.is_whitelist); $("#filterWhitelist").prop("checked", filter.is_whitelist);
$("#filterInsensitive").prop("checked", filter.is_insensitive); $("#filterInsensitive").prop("checked", filter.is_insensitive);

4
apps/templates/home/includes/filtermodal.html
View File

@ -47,13 +47,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer px-4">
<button type="button" id="deleteEditFilter" class="btn btn-danger rounded-1 me-auto ms-0 form-edit">Delete</button> <button type="button" id="deleteEditFilter" class="btn btn-danger rounded-1 me-auto ms-0 form-edit">Delete</button>
<button type="submit" class="btn btn-primary rounded-1"> <button type="submit" class="btn btn-primary rounded-1">
<span class="form-create">Create</span> <span class="form-create">Create</span>
<span class="form-edit">Confirm Edit</span> <span class="form-edit">Confirm Edit</span>
</button> </button>
<button type="button" class="btn btn-secondary rounded-1" data-bs-dismiss="modal">Cancel</button> <button type="button" class="btn btn-secondary rounded-1 ms-3 me-0" data-bs-dismiss="modal">Cancel</button>
</div> </div>
</form> </form>
</div> </div>