Merge pull request #9 from tled/django-fixes

Update django version

Author: dadrc

README.md

@@ -1,8 +1,11 @@
 # python3-django-inventory
+
 An inventory management system, based on buckets you can place items in
 
 # Install Guide
+
 **Requirements (Global Installations)**
+
  - Python3
  - NGINX
  - python3-django
@@ -13,45 +16,46 @@ An inventory management system, based on buckets you can place items in
  **Install Steps**
 
  **Django**
- 1. Create a new User and login as User
-	 - `adduser inventory`*
-	 - `su - inventory`*
- 2. Create Django-Project
-	 - `django-admin startproject website`*
-	 - `cd website`*
+
+  1. Create a new User and login as User
+     - `adduser inventory`
+     - `su - inventory`
+  2. Create Django-Project
+      - `django-admin startproject website`
+      - `cd website`
   3. Get python3-django-inventory
-	  - `git clone https://github.com/ChaosRambo/python3-django-inventory.git inventory`
-	4. Configure Django
-		-  `vim website/settings.py`*
-		- Add to `INSTALLED_APPS`:
-			- `'inventory',`
-			- `'crispy_forms',`
-		- Add to the end of the Settings:
-			- STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
-	5. Migrate
-		- `./manage.py --migrate`
-	 6. Optional Step
-		 - Test Django
-			 - `./manage.py --runserver`  
-			 - You will see the Django Test site
-			 - ![enter image description here](https://github.com/ChaosRambo/python3-django-inventory/blob/master/screenshots/django_testpage.jpeg?raw=true)
-	 7. Add URL Config
-		 - `vim website/urls.py`
-		 - Add if not exists:
-			 - `from django.conf.urls import url, include`
-		 - Add in `urlpatterns`
-			 - `url(r'^', include('inventory.urls', namespace='inventory')),`
-	  8.  Collectstatics
-		  - `./manage.py --collectstatics` 
-	  9. Optional Step
-		 - Test Django
-			 - `./manage.py runserver`
-			 - You will see an empty inventory
-			 - ![enter image description here](https://github.com/ChaosRambo/python3-django-inventory/blob/master/screenshots/empty_inventory.jpeg?raw=true)
-	 10. Add Admin
-		 - `./manage.py createsuperuser` 
-		11. Close User
-			- `exit`
+      - `git clone https://github.com/ChaosRambo/python3-django-inventory.git inventory`
+  4. Configure Django
+      - `vim website/settings.py`
+      - Add to `INSTALLED_APPS`:
+      - `'inventory',`
+      - `'crispy_forms',`
+      - Add to the end of the Settings:
+        - `STATIC_ROOT = os.path.join(BASE_DIR, 'static/')`
+  5. Migrate
+     - `./manage.py migrate`
+  6. Optional Step
+     - Test Django
+       - `./manage.py runserver`  
+       - You will see the Django Test site
+       - ![enter image description here](https://github.com/ChaosRambo/python3-django-inventory/blob/master/screenshots/django_testpage.jpeg?raw=true)
+  7. Add URL Config
+    - `vim website/urls.py`
+    - Add if not exists:
+      - `from django.urls import path, include, re_path`
+      - Add in `urlpatterns`
+        - `re_path(r'^', include(('inventory.urls', 'inventory'), namespace='inventory')),`
+  9. Collectstatics
+     - `./manage.py collectstatics` 
+  10. Optional Step
+      - Test Django
+        - `./manage.py runserver`
+        - You will see an empty inventory
+        - ![enter image description here](https://github.com/ChaosRambo/python3-django-inventory/blob/master/screenshots/empty_inventory.jpeg?raw=true)
+  11. Add Admin
+      - `./manage.py createsuperuser` 
+  12. Close User
+      - `exit`
 
 **uWSGI**
 

migrations/0001_initial.py

@@ -40,17 +40,17 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField()),
                 ('created', models.DateField()),
-                ('bucket', models.ForeignKey(to='inventory.Bucket')),
+                ('bucket', models.ForeignKey(to='inventory.Bucket', on_delete=models.CASCADE)),
             ],
         ),
         migrations.AddField(
             model_name='identifier',
             name='item',
-            field=models.ForeignKey(to='inventory.Item'),
+            field=models.ForeignKey(to='inventory.Item', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='identifier',
             name='type',
-            field=models.ForeignKey(to='inventory.IdentifierType'),
+            field=models.ForeignKey(to='inventory.IdentifierType', on_delete=models.CASCADE),
         ),
     ]

urls.py

@@ -1,14 +1,14 @@
-from django.conf.urls import url, include
+from django.urls import path, re_path, include
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.index, name='index'),
-    url(r'^bucket/(?P<bucket_id>[0-9]+)/$', views.bucket, name='bucket'),
-    url(r'^item/(?P<item_id>[0-9]+)/move/(?P<bucket_id>[0-9]+)/$',
+    re_path(r'^$', views.index, name='index'),
+    re_path(r'^bucket/(?P<bucket_id>[0-9]+)/$', views.bucket, name='bucket'),
+    re_path(r'^item/(?P<item_id>[0-9]+)/move/(?P<bucket_id>[0-9]+)/$',
         views.move, name='move'),
-    url(r'^item/(?P<item_id>[0-9]+)/$', views.item, name='item'),
-    url(r'^add/', views.add, name='add'),
-    url(r'^bucket/(?P<bucket_id>[0-9]+)/add/$', views.add, name='addtobucket'),
-    url(r'^search/$', views.search, name='search'),
-    url(r'^accounts/', include('django.contrib.auth.urls'))
+    re_path(r'^item/(?P<item_id>[0-9]+)/$', views.item, name='item'),
+    re_path(r'^add/', views.add, name='add'),
+    re_path(r'^bucket/(?P<bucket_id>[0-9]+)/add/$', views.add, name='addtobucket'),
+    re_path(r'^search/$', views.search, name='search'),
+    re_path(r'^accounts/', include('django.contrib.auth.urls'))
 ]

views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponseRedirect
 from django.forms import inlineformset_factory