ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pagesize not page_size, and pass it in based on job extras, also use path based on job extras, so we fix issue of fix_dups not knowing which path from settings was used (import or storage)

Browse Source
This commit is contained in:
Damien De Paoli
2021-03-06 11:45:21 +11:00
parent f1ec7f9eb6
commit b9dea327d0
3 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/dups.html
View File

@@ -10,12 +10,12 @@
<form class="d-flex justify-content-center form-inline">
<h5>
<div class="form-group">
<label for="page_size">{{overall_dup_sets}} sets/dirs of files
<label for="pagesize">{{overall_dup_sets}} sets/dirs of files
containing {{overall_dup_cnt}} files -- Showing&nbsp;</label>
<select class="form form-control" name="page_size">
<select class="form form-control" name="pagesize">
{% for o in "5", "10", "20", "50" %}
<option
{% if o|int == page_size %}
{% if o|int == pagesize %}
selected
{% endif %}
>{{o}}</option>
@@ -53,12 +53,12 @@
{% endfor %}
</div class="col-lg-12">
{% set page.cnt = page.cnt + 1 %}
{% if page.cnt == page_size %}
{% if page.cnt == pagesize %}
{% break %}
{% endif %}
{% endfor %}
{% if page.cnt < page_size %}
{% if page.cnt < pagesize %}
<h5 class="mt-3">Choose path to KEEP (same file names in 2 different directories):</h5>
{% for dup in per_path_dups %}
<div class="col-lg-12 py-2">
@@ -73,7 +73,7 @@
</script>
</div>
{% set page.cnt = page.cnt + 1 %}
{% if page.cnt == page_size %}
{% if page.cnt == pagesize %}
{% break %}
{% endif %}
{% endfor %}