Waveform signalling fixes

This commit is contained in:
Fergal Moran
2016-06-03 20:51:27 +01:00
parent d9cf702345
commit 83abc1fead
3 changed files with 10 additions and 20 deletions

View File

@@ -1,24 +1,12 @@
FROM fergalmoran/django
RUN mkdir /code
RUN mkdir /srv/logs
RUN mkdir /files
RUN mkdir /files/static
RUN mkdir /files/media
RUN mkdir /files/cache
RUN mkdir /files/cache/mixes
RUN mkdir /files/cache/waveforms
RUN mkdir /files/tmp
RUN touch /files/tmp/dss.log
WORKDIR /code
ADD requirements.txt /code/
ADD . /code/
RUN npm install -g yuglify
RUN pip install -r requirements.txt
RUN mkdir /files/static
RUN mkdir /files/media
RUN mkdir /files/cache/mixes
RUN mkdir /files/cache/waveforms
RUN touch /files/tmp/dss.log
RUN adduser --disabled-password --gecos '' djworker
RUN chown djworker /files -R
WORKDIR /code

View File

@@ -181,7 +181,8 @@ class ObtainUser(APIView):
'id': request.user.id,
'name': request.user.username,
'slug': request.user.userprofile.slug,
'userRole': 'user'
'session': request.user.userprofile.get_session_id(),
'userRole': 'user',
})
else:
return Response(status=status.HTTP_401_UNAUTHORIZED)

View File

@@ -1,5 +1,6 @@
import urllib.parse
import re
import urllib
from django.contrib.sites.models import Site
from django.template.defaultfilters import slugify