From 1bf776f5c1c311d58a575e48e8618fbeb53ef961 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Sat, 16 Apr 2022 12:10:56 +0200 Subject: [PATCH 1/2] Bugfix serving user media files --- README.md | 6 +++--- README_fr.md | 6 +++--- conf/urls.py | 6 ++---- manifest.json | 2 +- pyproject.toml | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 277a3e3..2c8ef1c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # django-for-runners for YunoHost -[![Integration level](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) [![Install django-for-runners with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=django-for-runners) *[Lire ce readme en français.](./README_fr.md)* @@ -33,7 +33,7 @@ This package for YunoHost used [django-yunohost-integration](https://github.com/ More screenshots are here: [jedie.github.io/tree/master/screenshots/django-for-runners](https://github.com/jedie/jedie.github.io/tree/master/screenshots/django-for-runners/README.creole) -**Shipped version:** 0.13.0~ynh1 +**Shipped version:** 0.13.0~ynh2 @@ -216,4 +216,4 @@ or sudo yunohost app upgrade django-for-runners -u https://github.com/YunoHost-Apps/django-for-runners_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** https://yunohost.org/packaging_apps diff --git a/README_fr.md b/README_fr.md index 533873d..d808ebe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # django-for-runners pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) [![Installer django-for-runners avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=django-for-runners) *[Read this readme in english.](./README.md)* @@ -29,7 +29,7 @@ This package for YunoHost used [django-yunohost-integration](https://github.com/ More screenshots are here: [jedie.github.io/tree/master/screenshots/django-for-runners](https://github.com/jedie/jedie.github.io/tree/master/screenshots/django-for-runners/README.creole) -**Version incluse :** 0.13.0~ynh1 +**Version incluse :** 0.13.0~ynh2 @@ -212,4 +212,4 @@ ou sudo yunohost app upgrade django-for-runners -u https://github.com/YunoHost-Apps/django-for-runners_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps diff --git a/conf/urls.py b/conf/urls.py index 692e08d..5806cb6 100644 --- a/conf/urls.py +++ b/conf/urls.py @@ -3,8 +3,7 @@ from django.conf.urls import static from django.contrib import admin from django.urls import path - -# from django_yunohost_integration.views import request_media_debug_view +from for_runners.views.media_files import UserMediaView if settings.PATH_URL: @@ -12,10 +11,9 @@ if settings.PATH_URL: # Prefix all urls with "PATH_URL": urlpatterns = [ path(f'{settings.PATH_URL}/', admin.site.urls), - # path(f'{settings.PATH_URL}/debug/', request_media_debug_view), + path(f'{settings.PATH_URL}/media//', UserMediaView.as_view()), # TODO: https://github.com/jedie/django-for-runners/issues/25 - # MEDIA_URL contains the "PATH_URL" already: # path(settings.MEDIA_URL.lstrip('/'), include('django_tools.serve_media_app.urls')), ] if settings.SERVE_FILES: diff --git a/manifest.json b/manifest.json index 189aac0..c6a679c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Store your GPX tracks of your running (or other sports activity)" }, - "version": "0.13.0~ynh1", + "version": "0.13.0~ynh2", "url": "https://github.com/jedie/django-for-runners", "upstream": { "license": "GPL-3.0", diff --git a/pyproject.toml b/pyproject.toml index baef9ac..94d9b4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "for_runners_ynh" -version = "0.13.0~ynh1" +version = "0.13.0~ynh2" description = "Test for_runners_ynh via local_test.py" authors = ["JensDiemer "] license = "GPL" From c81f71b452b58518eb6971bd139fc60d21f28158 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Apr 2022 10:13:37 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2c8ef1c..db0fb5d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # django-for-runners for YunoHost -[![Integration level](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) [![Install django-for-runners with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=django-for-runners) *[Lire ce readme en français.](./README_fr.md)* @@ -216,4 +216,4 @@ or sudo yunohost app upgrade django-for-runners -u https://github.com/YunoHost-Apps/django-for-runners_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index d808ebe..f4c4d75 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # django-for-runners pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/django-for-runners.svg)](https://dash.yunohost.org/appci/app/django-for-runners) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/django-for-runners.maintain.svg) [![Installer django-for-runners avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=django-for-runners) *[Read this readme in english.](./README.md)* @@ -212,4 +212,4 @@ ou sudo yunohost app upgrade django-for-runners -u https://github.com/YunoHost-Apps/django-for-runners_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file