From 8cc1f3cfb8a129f153e714be23b86f241aba5478 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 9 Dec 2020 11:52:18 +0100 Subject: [PATCH 1/2] Fix admin redirect by using the url pattern name and not hardcoded URL --- src/inventory_project/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inventory_project/urls.py b/src/inventory_project/urls.py index 9c8d8bd..76efaf7 100644 --- a/src/inventory_project/urls.py +++ b/src/inventory_project/urls.py @@ -10,7 +10,7 @@ admin.autodiscover() urlpatterns = [ # Don't use i18n_patterns() here path('admin/', admin.site.urls), - url(r'^$', RedirectView.as_view(url='/admin/')), + url(r'^$', RedirectView.as_view(pattern_name='admin:index')), path('ckeditor/', include('ckeditor_uploader.urls')), # TODO: check permissions? path(settings.MEDIA_URL.lstrip('/'), include('django_tools.serve_media_app.urls')), From 27d4c9801864b7f11ec4e5a3c1ced27ebddcae5e Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 9 Dec 2020 11:52:41 +0100 Subject: [PATCH 2/2] update README and release as 0.8.1rc2 --- README.creole | 7 +++++-- README.rst | 12 +++++++++--- deployment/project.env | 2 +- pyproject.toml | 2 +- src/inventory/__init__.py | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.creole b/README.creole index 7e0d96b..a459082 100644 --- a/README.creole +++ b/README.creole @@ -47,10 +47,11 @@ There are two main directories: == install -There exists two kind of installation/usage: +There exists these kind of installation/usage: * local development installation using poetry -* production use with docker-compose +* production use with docker-compose on a root server +* Install as [[https://yunohost.org|YunoHost]] App via [[https://github.com/jedie/pyinventory_ynh|yinventory_ynh]] This README contains only the information about local development installation. @@ -187,6 +188,8 @@ Files are separated into: "/src/" and "/development/" == history * [[https://github.com/jedie/PyInventory/compare/v0.8.0...master|compare v0.8.0...master]] **dev** +** Fix migration: Don't create "/media/migrate.log" if there is nothing to migrate +** Fix admin redirect by using the url pattern name ** tbc * [[https://github.com/jedie/PyInventory/compare/v0.7.0...v0.8.0|v0.8.0 - 06.12.2020]] ** Outsource the "MEDIA file serve" part into [[https://github.com/jedie/django-tools/tree/master/django_tools/serve_media_app#readme|django.tools.serve_media_app]] diff --git a/README.rst b/README.rst index 8b58e25..92ca14d 100644 --- a/README.rst +++ b/README.rst @@ -90,11 +90,13 @@ There are two main directories: install ------- -There exists two kind of installation/usage: +There exists these kind of installation/usage: * local development installation using poetry -* production use with docker-compose +* production use with docker-compose on a root server + +* Install as `YunoHost `_ App via `yinventory_ynh `_ This README contains only the information about local development installation. @@ -254,6 +256,10 @@ history * `compare v0.8.0...master `_ **dev** + * Fix migration: Don't create "/media/migrate.log" if there is nothing to migrate + + * Fix admin redirect by using the url pattern name + * tbc * `v0.8.0 - 06.12.2020 `_ @@ -379,4 +385,4 @@ donation ------------ -``Note: this file is generated from README.creole 2020-12-06 19:33:09 with "python-creole"`` \ No newline at end of file +``Note: this file is generated from README.creole 2020-12-09 11:11:42 with "python-creole"`` \ No newline at end of file diff --git a/deployment/project.env b/deployment/project.env index 92102ef..694a647 100644 --- a/deployment/project.env +++ b/deployment/project.env @@ -1,3 +1,3 @@ export PROJECT_NAME=pyinventory export PROJECT_PACKAGE_NAME=pyinventory -export PROJECT_VERSION=0.8.1rc1 +export PROJECT_VERSION=0.8.1rc2 diff --git a/pyproject.toml b/pyproject.toml index 82b725d..0f67144 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "PyInventory" -version = "0.8.1rc1" +version = "0.8.1rc2" description = "Web based management to catalog things including state and location etc. using Python/Django." authors = ["JensDiemer "] packages = [ diff --git a/src/inventory/__init__.py b/src/inventory/__init__.py index 5004f00..a54a355 100644 --- a/src/inventory/__init__.py +++ b/src/inventory/__init__.py @@ -4,7 +4,7 @@ :license: GNU GPL v3 or above, see LICENSE for more details. """ -__version__ = "0.8.1rc1" +__version__ = "0.8.1rc2" # https://docs.djangoproject.com/en/2.0/ref/applications/#configuring-applications-ref default_app_config = "inventory.apps.InventoryConfig"