This commit is contained in:
Joel Lavikainen
2017-05-24 18:11:28 +03:00
parent 3ce4f00746
commit 00829f4fd5
3 changed files with 6 additions and 3 deletions
+3
View File
@@ -182,6 +182,7 @@ class ImageInfoItem(InfoItem):
d["options"] = {'img': self.img.url}
return d
class VideoInfoItem(InfoItem):
display_name = ("Video")
video = models.FileField(upload_to="infovideos/")
@@ -198,6 +199,7 @@ class VideoInfoItem(InfoItem):
d["options"] = {'video': self.video.url}
return d
class HslInfoItem(InfoItem):
display_name = _("HSL timetables")
@@ -321,6 +323,7 @@ class ImageUploadForm(forms.Form):
name = forms.CharField()
image = forms.ImageField()
class UploadFileForm(forms.Form):
name = forms.CharField()
+3 -1
View File
@@ -159,6 +159,7 @@ def create_image_item(request, *args, **kwargs):
ImageInfoItem.objects.create(img=img, name=name)
return HttpResponse('{"status":"success"}')
@require_http_methods(["POST"])
@ensure_csrf_cookie
@permission_required('infoscreen.change_infoinstance', login_url='/login')
@@ -168,13 +169,14 @@ def create_video_item(request, *args, **kwargs):
print("hurdurr")
if not form.is_valid():
return HttpResponseBadRequest('{"status": "failure",'
'"error": "invalid data supplied"}')
'"error": "invalid data supplied"}')
video = form.cleaned_data['video']
name = form.cleaned_data['name']
VideoInfoItem.objects.create(video=video, name=name)
return HttpResponse('{"status": "success"}')
@require_http_methods(["POST"])
@ensure_csrf_cookie
@permission_required('infoscreen.add_rotation', login_url='/login')
-2
View File
@@ -27,8 +27,6 @@ import infoscreen.urls
import members.urls
urlpatterns = [
url(r'', include('webapp.urls')),
url(r'^members/', include('members.urls')),