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

Merge pull request #4374 from normanjaeckel/DeleteLogoFile

Browse Source 
Reset logo configs when logo is deleted.
This commit is contained in:
Emanuel Schütze 2019-02-19 22:01:45 +01:00 committed by GitHub
commit 6eea064862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -23,6 +23,7 @@ Core:
- Added password reset link (password reset via email) [#3914, #4199]. - Added password reset link (password reset via email) [#3914, #4199].
- Added global history mode [#3977, #4141]. - Added global history mode [#3977, #4141].
- Projector refactoring [4119, #4130]. - Projector refactoring [4119, #4130].
- Fixed logo configuration if logo file is deleted [#4374].
Agenda: Agenda:
- Added viewpoint to assign multiple items to a new parent item [#4037]. - Added viewpoint to assign multiple items to a new parent item [#4037].

7
openslides/mediafiles/views.py
View File

@ -1,6 +1,7 @@
from django.http import HttpResponseForbidden, HttpResponseNotFound from django.http import HttpResponseForbidden, HttpResponseNotFound
from django.views.static import serve from django.views.static import serve
from ..core.config import config
from ..utils.auth import has_perm from ..utils.auth import has_perm
from ..utils.rest_api import ModelViewSet, ValidationError from ..utils.rest_api import ModelViewSet, ValidationError
from .access_permissions import MediafileAccessPermissions from .access_permissions import MediafileAccessPermissions
@ -76,6 +77,12 @@ class MediafileViewSet(ModelViewSet):
# on server via Django methods (file, open(), save(), ...). # on server via Django methods (file, open(), save(), ...).
mediafile = self.get_object() mediafile = self.get_object()
mediafile.mediafile.storage.delete(mediafile.mediafile.name) mediafile.mediafile.storage.delete(mediafile.mediafile.name)
for logo in config["logos_available"]:
if config[logo]["path"] == mediafile.mediafile.url:
config[logo] = {
"display_name": config[logo]["display_name"],
"path": "",
}
return super().destroy(request, *args, **kwargs) return super().destroy(request, *args, **kwargs)