diff --git a/BUGs b/BUGs index 8f12143..7f8209e 100644 --- a/BUGs +++ b/BUGs @@ -1,6 +1,5 @@ ### Next: 146 BUG-143: if I skip next fast enough in files_ip, it can get the warning about changes to entry list... (would have though I disabled next page until loaded) -BUG-142: after transforming, the face data is still in the old spots, really should delete it - any change invalidates the face match BUG-140: When db is restarted underneath PA, it crashes job mgr... It should just accept timeouts, and keep trying to reconnect every 2? mins BUG-125: when an image is highlighted, then post the contextmenu on a different image - the highlight does not move to the new image and the selected menu function processes the original or the new depending on the way the code works. diff --git a/internal/js/files_support.js b/internal/js/files_support.js index d5f0e36..4fa6439 100644 --- a/internal/js/files_support.js +++ b/internal/js/files_support.js @@ -682,7 +682,6 @@ function getPage(pageNumber, successCallback, viewingIdx=0) $('#ra').prop('disabled', true) const startIndex = (pageNumber - 1) * OPT.how_many; const endIndex = startIndex + OPT.how_many; - console.log('pageNumber is: ' + pageNumber + ', about to make pageList from si=' +startIndex + ', to ei=' + endIndex ) pageList = entryList.slice(startIndex, endIndex); // set up data to send to server to get the entry data for entries in pageList diff --git a/internal/js/files_transform.js b/internal/js/files_transform.js index 821e81a..00025dd 100644 --- a/internal/js/files_transform.js +++ b/internal/js/files_transform.js @@ -2,7 +2,6 @@ // can only have 1 ammendment per image, its grayed out for other changes function removeAmendment( id ) { - console.log( 'removing amendment for: ' + id ) document.amendments=document.amendments.filter(obj => obj.eid !== id) } @@ -11,11 +10,16 @@ function removeAmendment( id ) function handleTransformImageJobCompleted(job, entry) { removeAmendment( entry.id ) - // update viewer and files* views, in case we view/go up without a new page load - // force reload with timestamped version of im.src - im.src=im.src + '?t=' + new Date().getTime(); - DrawImg() + // update viewer if we are viewing an image + if( document.viewing ) + { + // force reload with timestamped version of im.src + im.src=im.src + '?t=' + new Date().getTime(); + DrawImg() + } + // ALWAYS update files* div as we could go back to this from a viewer, and + // the thumbnail needs the updated data idx = entryList.indexOf(entry.id) // replace data for this entry now its been transformed document.entries[idx]=entry diff --git a/pa_job_manager.py b/pa_job_manager.py index 2075f83..bbe67b4 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -1925,6 +1925,8 @@ def JobTransformImage(job): e.file_details.hash = md5( job, e ) PAprint( f"JobTransformImage DONE thumb: job={job.id}, id={id}, amt={amt}" ) session.add(e) + # any faces in this file are no longer valid, remove them + session.query(FaceFileLink).filter(FaceFileLink.file_eid==e.id).delete() removeEntryAmendment( job, id ) FinishJob(job, "Finished Processesing image rotation/flip")