changed token word

TODO

@@ -11,7 +11,7 @@
 ### major fix - go to everywhere I call GetEntries(), and redo the logic totally...
     * client side: 
         * for real chance to stop confusion, instead of removing deleted images from DOM, we should gray them out and put a big Del (red circle with line?) though it as overlay.
-        * Create another table is entry_ammendments - note the deletions, rotations, flips of specific eids - then reproduce that on the client side visually as needed 
+        * Create another table of entry_ammendments - note the deletions, rotations, flips of specific eids - then reproduce that on the client side visually as needed
           - at least grayed-out, to indicate a pending action is not complete.
           - When job that flips, rotates, deletes completes then lets update the query details (e.g. remove eids, or remove the ammendments)
           - this actually is quite an improvement, if someone is deleting 2 as per above, I will see that as a pending change in my unrelated query, ditto flips, etc.

files.py

@@ -461,7 +461,10 @@ def change_file_opts():
     else:
         OPT.folders=False
     # so create a new entryList, and handle that on the client
-    query_data = GetQueryData( OPT )
+    if 'search' in request.referrer:
+        query_data = GetSearchQueryData( OPT )
+    else:
+        query_data = GetQueryData( OPT )
     return make_response( jsonify( query_data=query_data ) )
     
 

internal/js/files_support.js

@@ -567,7 +567,7 @@ function getPageFileList(res, viewingIdx)
 function getEntriesByIdSuccessHandler(res,pageNumber,successCallback,viewingIdx)
 {
     if( res.length != pageList.length )
-        document.alert="<alert class='alert alert-warning'>WARNING: something in data has changed since viewing this page (likely someone deleted content in another view), strongly suggest a page reload to get the latest data</alert>"
+        document.alert="<alert class='alert alert-warning'>WARNING: something has changed since viewing this page (likely someone deleted content in another view), strongly suggest a page reload to get the latest data</alert>"
     
     document.entries=res;
     // cache this
@@ -595,7 +595,7 @@ function getPage(pageNumber, successCallback, viewingIdx=0)
     const startIndex = (pageNumber - 1) * OPT.how_many;
     const endIndex = startIndex + OPT.how_many;
     pageList = entryList.slice(startIndex, endIndex);
-
+    
     // set up data to send to server to get the entry data for entries in pageList
     data={}
     data.ids = pageList
@@ -700,7 +700,11 @@ function isMobile() {
 // when we change one of the options (noo, how_many, folders) - then update '{how_many} files' str,
 // tweak noo menu for folders/flat view then reset the page contents based on current OPT values
 function changeOPT(successCallback) {
+    var old_how_many=OPT.how_many
     OPT.how_many=$('#how_many').val()
+    // if we change how_many invalidate page cache as page size is different now
+    if( OPT.how_many != old_how_many )
+        document.page.length=0
     new_f=$('#folders').val()
     new_f=( new_f == 'True' )
     // if change to/from folders, also fix the noo menu
@@ -729,9 +733,10 @@ function changeOPT(successCallback) {
         contentType: 'application/json',
         success: function(resp) {
             entryList=resp.query_data.entry_list
+            OPT.how_many=parseInt(OPT.how_many)
+            pageList=entryList.slice(0, OPT.how_many)
             // put data back into booleans, ints, etc
             OPT.folders=( OPT.folders == 'True' )
-            OPT.how_many=parseInt(OPT.how_many)
             $('.how_many_text').html( `&nbsp;${OPT.how_many} files&nbsp;` )
             OPT.size=parseInt(OPT.size)
             getPage(1,successCallback)