|
|
22b41899e9
|
FIXED: BUG-32: sometimes still getting extra directories in Bin, that just have a trailing slash (or 2 or 3, etc.) -- Also improved Job logs for Del/Restore
|
2021-06-12 17:06:54 +10:00 |
|
|
|
f776a6a3c1
|
fixed up commit where I removed the data on the POST, so del/restore stopped working
|
2021-06-12 17:06:24 +10:00 |
|
|
|
471ed3c972
|
FIXED: BUG-30: when restoring, the OK button is red not green in dbox, added new BUG-32: sometimes still getting extra directories in Bin, that just have a trailing slash (or 2 or 3, etc.)
|
2021-06-12 16:36:40 +10:00 |
|
|
|
630b455bc0
|
removed del/restore TODOs its working, moved order of some TODOs too
|
2021-06-11 23:41:35 +10:00 |
|
|
|
2f3224ea61
|
put messages to FE in for del / restore. Also, added code to see if files in Bin/ path, if so do quick WARNING, with TODO on how to improve. Finally, when importing Bin paths, just do the intial AddPath (and AddDir), then bail out of further importing. Fixed misssing return on function too
|
2021-06-11 23:39:21 +10:00 |
|
|
|
f72a7c17bb
|
added BUGs
|
2021-06-11 23:32:58 +10:00 |
|
|
|
68f0fdcc33
|
only show meaningful extra job content on job summary page - for now path* only
|
2021-06-11 23:32:48 +10:00 |
|
|
|
8b5633ea23
|
good spot to stop, some TODOs left, but really delete/restore now works
|
2021-06-11 20:26:56 +10:00 |
|
|
|
137b3f347d
|
removed debugs, created ClearOtherDupMessagesAndJobs() function so CheckDups jobs created by restore/delete are removing old f/e messages, e.g. I delete a dup by hand and the dup error disappears :) MAIN thing though is the crazy restore/delete paths are now fully functional, with content in top-level of a path, different paths on import, and in subdirs of import PATHs, also tested mass delete via flat-view of all files, then mass restore -- ALL WORKED :)
|
2021-06-11 20:26:15 +10:00 |
|
|
|
c3398ef77a
|
for now made del/restore force a reload of main page, it still does not show you created the del/restore job, but it is better than nothing. Also fixed dumb bug I introduced when handling trash/restore icons and moved an if rather than copied it between the alert for dir in and buttons for del/restore
|
2021-06-11 19:03:37 +10:00 |
|
|
|
2451d25a0c
|
spelling fix
|
2021-06-11 19:02:22 +10:00 |
|
|
|
9aec3af90a
|
remove debug
|
2021-06-11 19:02:04 +10:00 |
|
|
|
0b6acd1899
|
changed to consistently use restore instead of awful undelete
|
2021-06-10 17:55:44 +10:00 |
|
|
|
804c7cbf56
|
made trash icon be red/Delete or green/Restore for GUI, plumbed this through modified DelDBox() and hooked it all so that you can either click the button, or right-click context menu and you will get the right del/restore dbox and that routes through via ajax to the right URL and actually deletes/restores. Also tweaked right-click to start context menu so that it is also a way to alter highlighting -- this honours ctrl and shift too
|
2021-06-10 17:45:08 +10:00 |
|
|
|
d80871b063
|
added undelete functions
|
2021-06-10 17:43:05 +10:00 |
|
|
|
3c8f72cfd6
|
added undelete route/function
|
2021-06-10 17:42:52 +10:00 |
|
|
|
b63d349c9f
|
update for next steps
|
2021-06-09 21:42:40 +10:00 |
|
|
|
3bf97df7fe
|
added instructions for upstream contents
|
2021-06-09 21:41:01 +10:00 |
|
|
|
6a0141504d
|
added JobDeleteFiles plumbing / tested... removed test code for Undel, and added in CheckDups call for Undel - that is untested though, so debug to that effect still in this commit
|
2021-06-09 21:34:59 +10:00 |
|
|
|
7bbea21981
|
switched over to smarter context menu, hooked up delete button to ajax call, but not context menu yet - nor undelete. Made contextmenu detect path of object and del/undel appropriately, which also fixes a few quirks/bugs with no data in DB and trying to find the path of the first/non-existant entry
|
2021-06-09 21:34:16 +10:00 |
|
|
|
9676738bdc
|
made dialog be 75-100% to better fit content, added upstream-d URLs for jquery contextMenu
|
2021-06-09 21:32:53 +10:00 |
|
|
|
3688319ebd
|
put route in for delete files - from GUI (button only for now, will also be context menu soon)
|
2021-06-09 21:32:18 +10:00 |
|
|
|
824aae3f94
|
clicking on the bg removes selection/highlights
|
2021-06-09 18:06:57 +10:00 |
|
|
|
8e4b5fe09b
|
minor formatting fix to make dbox work better
|
2021-06-09 17:57:58 +10:00 |
|
|
|
823eeeb18e
|
updated partial progress on undelete
|
2021-06-08 21:17:52 +10:00 |
|
|
|
97a21cadab
|
created/tested an Undelete function and associated classes, it works but nothing calls it yet
|
2021-06-08 21:17:38 +10:00 |
|
|
|
060cf8acd2
|
put beginnings of undelete in context menu -> does nothing as yet, nor does delete for that matter. tweaked the alert displaying folder we are in to better show path icon and location, added a disabled back button in folder view so actual folders dont jumped around when you go into the first folder and a back button used to appear. Peak into first entry to see if we are viewing a Bin path and if so, then we could use undel.... In hindsight this is a hack that needs to be thought through per file (when I search it will break), but its a start for now and shows the right context menu when viewing a specific path.
|
2021-06-08 21:16:49 +10:00 |
|
|
|
651e1250a4
|
added DEL_FILE
|
2021-06-08 21:13:41 +10:00 |
|
|
|
b315503832
|
fixed subtle BUG, from when I changed over form EntryDirLink to PathDirLink, I was still joining Entry AND Path for Dir Links, by hand joining these tables, I get lost, so not surprised it gives ambigous results -- manifested in lost Dirs in the f/e after delete/undelete. Also cleaned up debugs
|
2021-06-08 21:13:18 +10:00 |
|
|
|
11386f57a4
|
thumbs should not land in image dirs, they are both linux/windows meant to land in cache/home dirs, so ignoring this todo
|
2021-06-07 17:51:39 +10:00 |
|
|
|
66268ad6bb
|
use explicit set of dir_obj for path, as ORM cant easily work out which dir is the right one for a path
|
2021-06-07 17:46:45 +10:00 |
|
|
|
43f60cba93
|
default for grouping should be None not Day when searching (only time there is no grouping value set) AND this matches defaults now set in files.py ViewingOptions function
|
2021-06-06 17:34:45 +10:00 |
|
|
|
baab4569d2
|
finished showing path location on search TODO, also dont want to do the route consolidation suggestion after more thought
|
2021-06-06 17:25:30 +10:00 |
|
|
|
6d854628ae
|
removed unnecessary css/js -> copied form pybook and not used, also made all upstream/internet resources local. NOTE: static/upstream is not in git, can just be downloaded from internet if needed again anyway
|
2021-06-06 17:24:55 +10:00 |
|
|
|
46fc90ddeb
|
if via folders or grouping is none we create the row of images. if we are searching, added mini icon in bottom-left to show where the image is from (import/storage/bin)
|
2021-06-06 17:23:23 +10:00 |
|
|
|
e20faac23b
|
added new func LocationIcon so html can ieve the icon based on objects type of path
|
2021-06-06 17:22:25 +10:00 |
|
|
|
ecefb59458
|
added icons for paths into a dict ICON, and func to retrieve the icon based on objects type of path
|
2021-06-06 17:21:45 +10:00 |
|
|
|
3cf27e9366
|
path now shows type in object
|
2021-06-06 17:21:08 +10:00 |
|
|
|
b27391003f
|
fix bug where view import via folder did not have a cwd set, also fixed new bug where toggling from flat to folders with a grouping set would bug out, force grouping=None when folders chosen
|
2021-06-06 17:20:18 +10:00 |
|
|
|
943742df67
|
update next BUG num
|
2021-06-06 17:19:26 +10:00 |
|
|
|
7e2494884e
|
can now toggle between folder or flat view, its a bit ugly, but it works
|
2021-06-06 14:09:11 +10:00 |
|
|
|
b6156dad34
|
Merge branch 'master' of 192.168.0.2:photoassistant
|
2021-06-06 12:23:11 +10:00 |
|
|
|
98c4dc1049
|
updated TODO
|
2021-06-06 12:23:09 +10:00 |
|
Damien De Paoli
|
9a9dc01c5a
|
added code to check paths exist on startup
|
2021-05-28 16:37:26 +10:00 |
|
|
|
4ed76961a8
|
Now have an AddPath (which calls AddDir if needed). This also fixes a bug where re-scanning, caused duplicate database entries. Also cleaned up comments, prints
|
2021-05-27 18:34:08 +10:00 |
|
|
|
a9c24d6f13
|
minor update
|
2021-05-27 18:25:25 +10:00 |
|
|
|
c94daf86f6
|
updated sql to not retrieve duplicates that involve the recycle bin
|
2021-05-27 18:25:10 +10:00 |
|
|
|
b54c00eafe
|
updated comment
|
2021-05-27 18:24:45 +10:00 |
|
|
|
9b926938e4
|
added viewing recycle bin via folders, added comments, cleaned up TODO to note this is done
|
2021-05-26 18:32:52 +10:00 |
|
|
|
8dc98dd368
|
first-pass of deleting a file moving to the bin instead, not in right spot on FS/ path&rel_path, and no visualisation yet
|
2021-05-24 07:42:08 +10:00 |
|
