Merge branch 'master' of 192.168.0.2:photoassistant
This commit is contained in:
4
files.py
4
files.py
@@ -271,6 +271,8 @@ def files_sp():
|
||||
noo, grouping, how_many, offset, size, folders, cwd, root = ViewingOptions( request )
|
||||
entries=[]
|
||||
|
||||
people = Person.query.all()
|
||||
|
||||
# per storage path, add entries to view
|
||||
settings=Settings.query.first()
|
||||
paths = settings.storage_path.split("#")
|
||||
@@ -283,7 +285,7 @@ def files_sp():
|
||||
else:
|
||||
entries+=GetEntriesInFlatView( cwd, prefix, noo, offset, how_many )
|
||||
|
||||
return render_template("files.html", page_title='View Files (Storage Path)', entry_data=entries, noo=noo, grouping=grouping, how_many=how_many, offset=offset, size=size, folders=folders, cwd=cwd, root=root )
|
||||
return render_template("files.html", page_title='View Files (Storage Path)', entry_data=entries, noo=noo, grouping=grouping, how_many=how_many, offset=offset, size=size, folders=folders, cwd=cwd, root=root, people=people )
|
||||
|
||||
|
||||
################################################################################
|
||||
|
||||
Reference in New Issue
Block a user