ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3418 from FinnStutzenstein/ServeLogos

Browse Source 
Serve Logos
This commit is contained in:
Emanuel Schütze 2017-09-27 10:52:29 +02:00 committed by GitHub
commit 231a056790
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/mediafiles/models.py
View File

@ -2,6 +2,7 @@ from django.conf import settings
from django.db import models from django.db import models
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from ..core.config import config
from ..core.models import Projector from ..core.models import Projector
from ..utils.autoupdate import inform_changed_data from ..utils.autoupdate import inform_changed_data
from ..utils.models import RESTModelMixin from ..utils.models import RESTModelMixin
@ -94,3 +95,9 @@ class Mediafile(RESTModelMixin, models.Model):
kB = size / 1024 kB = size / 1024
size_string = '%d kB' % kB size_string = '%d kB' % kB
return size_string return size_string
def is_logo(self):
for key in config['logos_available']:
if config[key]['path'] == self.mediafile.url:
return True
return False

5
openslides/mediafiles/views.py
View File

@ -77,8 +77,9 @@ def protected_serve(request, path, document_root=None, show_indexes=False):
except Mediafile.DoesNotExist: except Mediafile.DoesNotExist:
return HttpResponseNotFound(content="Not found.") return HttpResponseNotFound(content="Not found.")
if (not has_perm(request.user, 'mediafiles.can_see') or if ((not has_perm(request.user, 'mediafiles.can_see') or
(mediafile.hidden and not has_perm(request.user, 'mediafiles.can_see_hidden'))): (mediafile.hidden and not has_perm(request.user, 'mediafiles.can_see_hidden'))) and
not mediafile.is_logo()):
return HttpResponseForbidden(content="Forbidden.") return HttpResponseForbidden(content="Forbidden.")
else: else:
return serve(request, path, document_root, show_indexes) return serve(request, path, document_root, show_indexes)