rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

path bug

Browse Source
This commit is contained in:
bkfox 2022-10-10 18:23:19 +02:00
parent 8c8ac863dd
commit 05a3b9c95d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aircox/models/program.py
View File

@ -98,13 +98,10 @@ class Program(Page):
Return a Program from the given path. We assume the path has been
given in a previous time by this model (Program.path getter).
"""
if path.startswith(conf.MEDIA_ROOT):
path = path.replace(conf.MEDIA_ROOT + '/', '')
path = path.replace(settings.AIRCOX_PROGRAMS_DIR, '')
if path.startswith(settings.AIRCOX_PROGRAMS_DIR):
path = path.replace(settings.AIRCOX_PROGRAMS_DIR + '/', '')
while path[0] == '/':
path = path[1:]
path = path[:path.index('/')]
return cl.objects.filter(slug=path.replace('_','-')).first()

3
aircox/settings.py
View File

@ -86,8 +86,7 @@ ensure('AIRCOX_DEFAULT_USER_GROUPS', {
})
# Directory for the programs data
# TODO: rename to PROGRAMS_ROOT
ensure('AIRCOX_PROGRAMS_DIR', 'programs')
ensure('AIRCOX_PROGRAMS_DIR', os.path.join(settings.MEDIA_ROOT, 'programs'))
########################################################################