Merge branch 'develop' into feature/jwtHistoryFiles

This commit is contained in:
Andrey
2021-12-22 17:13:10 +03:00
committed by GitHub
81 changed files with 469 additions and 225 deletions

View File

@ -164,7 +164,7 @@ def getRootFolder(req):
else:
curAdr = req.META['REMOTE_ADDR']
directory = os.path.join(config.STORAGE_PATH, curAdr)
directory = config.STORAGE_PATH if os.path.isabs(config.STORAGE_PATH) else os.path.join(config.STORAGE_PATH, curAdr)
if not os.path.exists(directory): # if such a directory does not exist, make it
os.makedirs(directory)

View File

@ -79,7 +79,7 @@ descr_user_0 = [
USERS = [
User('uid-1', 'John Smith', 'smith@example.com',
None, None, {},
'', None, {},
None, [], descr_user_1, True),
User('uid-2', 'Mark Pottato', 'pottato@example.com',
'group-2', ['group-2', ''], {
@ -96,7 +96,7 @@ USERS = [
},
False, ["copy", "download", "print"], descr_user_3, False),
User('uid-0', None, None,
None, None, {},
'', None, {},
None, [], descr_user_0, False)
]