Merge pull request #31 from jedie/fix-urls

Fix urls

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]]

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 <https://yunohost.org>`_ App via `yinventory_ynh <https://github.com/jedie/pyinventory_ynh>`_
 
 This README contains only the information about local development installation.
 
@@ -254,6 +256,10 @@ history
 
 * `compare v0.8.0...master <https://github.com/jedie/PyInventory/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 <https://github.com/jedie/PyInventory/compare/v0.7.0...v0.8.0>`_ 
@@ -379,4 +385,4 @@ donation
 
 ------------
 
-``Note: this file is generated from README.creole 2020-12-06 19:33:09 with "python-creole"``
+``Note: this file is generated from README.creole 2020-12-09 11:11:42 with "python-creole"``

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

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 <git@jensdiemer.de>"]
 packages = [

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"

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')),