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

quick fix for view being a POST, its now redirected to a GET, but I want to fix up the viewlist properly as well, should work for now though

Browse Source
This commit is contained in:
Damien De Paoli
2022-01-20 11:26:09 +11:00
parent c800bebaab
commit 30a2fa6d99
5 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
options.py
View File

@@ -23,9 +23,10 @@ class PA_PREF(db.Model):
fullscreen = db.Column(db.Boolean, unique=False, nullable=False )
root = db.Column(db.String, unique=False, nullable=False )
cwd = db.Column(db.String, unique=False, nullable=False )
view_eids = db.Column(db.String, unique=False, nullable=False )
def __repr__(self):
return f"<pa_user_dn: {self.pa_user_dn}, path_type: {self.path_type}, noo: {self.noo}, grouping: {self.grouping}, how_many: {self.how_many}, st_offset: {self.st_offset}, size: {self.size}, folders: {self.folders}, root: {self.root}, cwd: {self.cwd}>"
return f"<pa_user_dn: {self.pa_user_dn}, path_type: {self.path_type}, noo: {self.noo}, grouping: {self.grouping}, how_many: {self.how_many}, st_offset: {self.st_offset}, size: {self.size}, folders: {self.folders}, root: {self.root}, cwd: {self.cwd}, view_eids: {self.view_eids}>"
################################################################################
@@ -37,8 +38,13 @@ class Options(PA):
def __init__(self, request):
if 'orig_url' in request.form:
url = request.form['orig_url']
if 'eids' in request.form:
print( "setting view_eids due to form" )
self.view_eids = request.form['eids'].rstrip(',')
else:
url = request.path
print( "setting view_eids due to null (for now)" )
self.view_eids=""
self.orig_url=url
if 'files_sp' in url:
self.path_type = 'Storage'
@@ -78,6 +84,7 @@ class Options(PA):
if pref:
self.folders=pref.folders
self.noo=pref.noo
self.view_eids=pref.view_eids
else:
self.folders=False
self.noo="Oldest"
@@ -138,7 +145,7 @@ class Options(PA):
pref=PA_PREF.query.filter(PA_PREF.pa_user_dn==current_user.dn,PA_PREF.path_type==self.path_type).first()
if not pref:
pref=PA_PREF( pa_user_dn=current_user.dn, path_type=self.path_type, noo=self.noo, grouping=self.grouping, how_many=self.how_many,
st_offset=self.offset, size=self.size, folders=self.folders, root=self.root, cwd=self.cwd)
st_offset=self.offset, size=self.size, folders=self.folders, root=self.root, cwd=self.cwd, view_eids=self.view_eids)
else:
pref.noo=self.noo
pref.grouping=self.grouping
@@ -148,6 +155,7 @@ class Options(PA):
pref.folders=self.folders
pref.root = self.root
pref.cwd = self.cwd
pref.view_eids = self.view_eids
db.session.add(pref)
db.session.commit()