MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '666-admin-loading' into 'master' 

Resolve "Error 500 when loading /api/admin/music/track/99104/change/ (edit track  via django admin)"

See merge request funkwhale/funkwhale!556
This commit is contained in:
Eliot Berriot 2019-01-24 14:03:18 +01:00
parent d402a927af 3b87580a69
commit 32816a3425
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/Dockerfile
View File

@ -25,15 +25,18 @@ RUN \
RUN mkdir /requirements RUN mkdir /requirements
COPY ./requirements/base.txt /requirements/base.txt COPY ./requirements/base.txt /requirements/base.txt
# hack around https://github.com/pypa/pip/issues/6158#issuecomment-456619072
ENV PIP_DOWNLOAD_CACHE=/noop/
RUN \ RUN \
echo 'fixing requirements file for alpine' && \ echo 'fixing requirements file for alpine' && \
sed -i '/Pillow/d' /requirements/base.txt && \ sed -i '/Pillow/d' /requirements/base.txt && \
\ \
\ \
echo 'installing pip requirements' && \ echo 'installing pip requirements' && \
pip3 install --no-cache-dir --upgrade pip && \ pip3 install --upgrade pip && \
pip3 install --no-cache-dir setuptools wheel && \ pip3 install setuptools wheel && \
pip3 install --no-cache-dir -r /requirements/base.txt pip3 install -r /requirements/base.txt && \
rm -rf $PIP_DOWNLOAD_CACHE
ARG install_dev_deps=0 ARG install_dev_deps=0
COPY ./requirements/*.txt /requirements/ COPY ./requirements/*.txt /requirements/

2
api/funkwhale_api/music/admin.py
View File

@ -20,7 +20,7 @@ class AlbumAdmin(admin.ModelAdmin):
class TrackAdmin(admin.ModelAdmin): class TrackAdmin(admin.ModelAdmin):
list_display = ["title", "artist", "album", "mbid"] list_display = ["title", "artist", "album", "mbid"]
search_fields = ["title", "artist__name", "album__title", "mbid"] search_fields = ["title", "artist__name", "album__title", "mbid"]
list_select_related = True list_select_related = ["album__artist", "artist"]
@admin.register(models.ImportBatch) @admin.register(models.ImportBatch)

2
api/requirements/base.txt
View File

@ -42,7 +42,7 @@ ipython>=6,<7
mutagen>=1.42,<1.43 mutagen>=1.42,<1.43
django-taggit>=0.22,<0.23 django-taggit>=0.23,<0.24
pymemoize==1.0.3 pymemoize==1.0.3
django-dynamic-preferences>=1.7,<1.8 django-dynamic-preferences>=1.7,<1.8

1
changes/changelog.d/666.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed crashing Django admin when loading track detail page (#666)