diff --git a/BUGs b/BUGs
index 09fa090..77b3cc3 100644
--- a/BUGs
+++ b/BUGs
@@ -1,7 +1,27 @@
-### Next: 80
+### Next: 81
BUG-56: when making a viewing list of AI:mich, (any search?) and going past the page_size, it gets the wrong data from the DB for the 'next' entry
BUG-60: entries per page (in folders view) ignores pagesize, and this also contributes to BUG-56 I think
BUG-74: search/others? remembers start/offset, and if you reset view (e.g. another search) it doesnt show first page of results
BUG-77: when moving folders out from a parent folder (storage/2020 off-camera-to-oct), it did not delete the empty 2020 off-camera-to-oct folder
-- something odd happened here, not sure it is a bug, maybe dodgy data at the time in the DB?
BUG-79: changing size does not post back the OPT change, so doesn't save to prefs (unless you change say how_many after size)
+BUG-80: viewed AI:fikkers, and next, next, etc. got this:
+ ESC[36mpaweb |ESC[0m [2022-01-16 01:19:34,305] ERROR in app: Exception on /viewlist [POST]
+ ESC[36mpaweb |ESC[0m Traceback (most recent call last):
+ ESC[36mpaweb |ESC[0m File "/usr/local/lib/python3.8/dist-packages/flask/app.py", line 2070, in wsgi_app
+ ESC[36mpaweb |ESC[0m response = self.full_dispatch_request()
+ ESC[36mpaweb |ESC[0m File "/usr/local/lib/python3.8/dist-packages/flask/app.py", line 1515, in full_dispatch_request
+ ESC[36mpaweb |ESC[0m rv = self.handle_user_exception(e)
+ ESC[36mpaweb |ESC[0m File "/usr/local/lib/python3.8/dist-packages/flask/app.py", line 1513, in full_dispatch_request
+ ESC[36mpaweb |ESC[0m rv = self.dispatch_request()
+ ESC[36mpaweb |ESC[0m File "/usr/local/lib/python3.8/dist-packages/flask/app.py", line 1499, in dispatch_request
+ ESC[36mpaweb |ESC[0m return self.ensure_sync(self.view_functions[rule.endpoint])(**req.view_args)
+ ESC[36mpaweb |ESC[0m File "/usr/local/lib/python3.8/dist-packages/flask_login/utils.py", line 272, in decorated_view
+ ESC[36mpaweb |ESC[0m return func(*args, **kwargs)
+ ESC[36mpaweb |ESC[0m File "/code/files.py", line 494, in viewlist
+ ESC[36mpaweb |ESC[0m entries=GetEntries( OPT )
+ ESC[36mpaweb |ESC[0m File "/code/files.py", line 272, in GetEntries
+ ESC[36mpaweb |ESC[0m for path in OPT.paths:
+ ESC[36mpaweb |ESC[0m TypeError: 'NoneType' object is not iterable
+
+ IT is caused by next'ing past the end of how_many, so its prob. related to BUG-56 above
diff --git a/TODO b/TODO
index ec48c2a..b8d82c3 100644
--- a/TODO
+++ b/TODO
@@ -6,9 +6,6 @@
*** Need to double-check scheduled jobs running in PROD (can use new pa_job_manager.log)
- * have a user img in rhs of navbar, as drop-down showing logged in user and allowing to view prefs as they are in DB
- (maybe set them as well, might want to tweak them one day?)
-
* only show say last week of jobs, or last 50? and archive the rest into an archived_jobs table
need scheduled jobs:
- [DONE] force scans of import/storage paths
@@ -27,11 +24,13 @@
* when hitting back button to a search, it doesnt handle the post, etc.
$(document).ready(function() {
- window.history.pushState(null, "", window.location.href);
window.onpopstate = function() {
- window.history.pushState(null, "", window.location.href);
+ # this seems to work, but feels like no protection at all???
+ # (what about back when it goes onto a POST of deleting a file!)
+ window.history.back()
};
});
+ -- maybe window.history.replace() is needed on unsafe URLs?
* delete folder
diff --git a/internal/icons.svg b/internal/icons.svg
index da3228b..68482c5 100644
--- a/internal/icons.svg
+++ b/internal/icons.svg
@@ -204,4 +204,7 @@
+
diff --git a/main.py b/main.py
index 56f0f8f..34c0482 100644
--- a/main.py
+++ b/main.py
@@ -14,7 +14,7 @@ from shared import CreateSelect, CreateFoldersSelect, LocationIcon, DB_URL, PROD
# for ldap auth
from flask_ldap3_login import LDAP3LoginManager
-from flask_login import LoginManager, login_user, login_required, UserMixin, current_user
+from flask_login import LoginManager, login_user, login_required, UserMixin, current_user, logout_user
from flask_ldap3_login.forms import LDAPLoginForm
@@ -73,6 +73,7 @@ app.jinja_env.globals['CreateSelect'] = CreateSelect
app.jinja_env.globals['CreateFoldersSelect'] = CreateFoldersSelect
app.jinja_env.globals['LocationIcon'] = LocationIcon
app.jinja_env.globals['NEWEST_LOG_LIMIT'] = NEWEST_LOG_LIMIT
+app.jinja_env.globals['current_user'] = current_user
# Declare a User Loader for Flask-Login.
@@ -132,9 +133,29 @@ def login():
return render_template("login.html", form=form)
+@app.route('/logout')
+@login_required
+def logout():
+ logout_user()
+ return redirect('/login')
if __name__ == "__main__":
if hostname == PROD_HOST:
app.run(ssl_context=('/etc/letsencrypt/live/pa.depaoli.id.au/cert.pem', '/etc/letsencrypt/live/pa.depaoli.id.au/privkey.pem'), host="0.0.0.0", debug=False)
else:
app.run(host="0.0.0.0", debug=True)
+
+###############################################################################
+# This func creates a new filter in jinja2 to test to hand back the username
+# from the ldap dn
+################################################################################
+@app.template_filter('Username')
+def _jinja2_filter_parentpath(dn):
+
+ # pull apart a dn (uid=xxx,dn=yyy,etc), and return the xxx
+ username=str(dn)
+ s=username.index('=')
+ s+=1
+ f=username.index(',')
+ return username[s:f]
+
diff --git a/options.py b/options.py
index 9e3a2c0..2778cdb 100644
--- a/options.py
+++ b/options.py
@@ -1,5 +1,6 @@
from settings import Settings, SettingsRBPath, SettingsIPath, SettingsSPath
-from flask_login import current_user
+from flask import request, render_template, redirect, url_for
+from flask_login import login_required, current_user
from main import db, app, ma
from shared import PA
@@ -145,3 +146,13 @@ class Options(PA):
db.session.add(pref)
db.session.commit()
+
+################################################################################
+# /prefs -> GET only -> prints out list of all prefs (simple for now)
+################################################################################
+@app.route("/prefs", methods=["GET"])
+@login_required
+def prefs():
+ prefs = PA_PREF.query.filter( PA_PREF.pa_user_dn==current_user.dn ).all()
+ return render_template("prefs.html", prefs=prefs )
+
diff --git a/templates/base.html b/templates/base.html
index e2f39fb..4b2b05e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -114,6 +114,15 @@
+