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

moved to storing DB ids rather than names of files/dirs for deletions

Browse Source
This commit is contained in:
Damien De Paoli
2021-02-14 16:18:22 +11:00
parent d9a94ff5da
commit 0bfd3b58b3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/dups.html
View File

@@ -12,7 +12,9 @@
let F=[]
</script>
<div class="row">
<form class="form form-inline col-lg-12" action="" method="POST">
<form class="form form-inline col-lg-12" action="{{url_for('rm_dups')}}" method="POST">
{# pass this through so that the back-end can delete this message when it rm_dups #}
<input type="hidden" name="fe_msg_id" value={{fe_msg_id}}>
{% for dups in per_file_dups %}
{% set outer_loop=loop.index %}
<div class="col-lg-12 py-4">
@@ -22,9 +24,12 @@
onClick="KeepFile({{outer_loop}},{{loop.index}})">{{dup.d}}/{{dup.f}}</alert>
{% if loop.index < dups|length %}
or
{% else %}
<input type="hidden" name="kfhash-{{outer_loop}}" value="{{dup.h}}">
<input type="hidden" id="kfname-{{outer_loop}}" name="kfname-{{outer_loop}}" value="">
{% endif %}
<script>
F[{{outer_loop}}{{loop.index}}]="{{dup.f}}"
F[{{outer_loop}}{{loop.index}}]="{{dup.id}}"
</script>
{% endfor %}
</div class="col-lg-12">
@@ -35,10 +40,11 @@
<h5>{{dup.count}} duplicate files (same file names in 2 different directories). Choose path to KEEP:</h5>
<alert id="kd{{loop.index}}-d1" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 1)" class="alert">{{dup.d1}}</alert> or
<alert id="kd{{loop.index}}-d2" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 2)" class="alert">{{dup.d2}}</alert>
<input id="kd{{loop.index}}" type="hidden" name="k1" value="{{dup.d2}}">
<input id="kdid-{{loop.index}}" type="hidden" name="kdid-1">
<input name="kdhash-{{loop.index}}" type="hidden" value="{{dup.hashes}}">
<script>
D[{{loop.index}}1]="{{dup.d1}}"
D[{{loop.index}}2]="{{dup.d2}}"
D[{{loop.index}}1]="{{dup.did1}}"
D[{{loop.index}}2]="{{dup.did2}}"
</script>
</div>
{% endfor %}
@@ -54,14 +60,14 @@
{
$('[id^=kf' + row + ']').attr('class', 'alert alert-danger sm-txt')
$('#kf'+row+'-f'+which).attr('class', 'alert alert-success')
$('#kf'+row).val( F[row.toString()] )
$('#kfname-'+row).val( F[row.toString()+which.toString()] )
}
function KeepDir(row, which)
{
$('[id^=kd]').attr('class', 'alert alert-danger sm-txt')
$('#kd'+row+'-d'+which).attr('class', 'alert alert-success')
$('#kd'+row).val( D[row.toString()+which.toString()] )
$('#kdid-'+row).val( D[row.toString()+which.toString()] )
}
// force choose last of each keep file set