From 58e41eaa9f3c6433ffb00cde2c3dd53b5fd02cae Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Tue, 12 Dec 2017 16:53:09 +0100
Subject: [PATCH] Corrections
---
.../equipment_and_rooms/equipment/add.html | 5 -----
.../equipment_and_rooms/equipment/edit.html | 5 -----
.../templates/equipment_and_rooms/rooms/add.html | 5 -----
.../templates/equipment_and_rooms/rooms/edit.html | 5 -----
smash/web/urls.py | 2 +-
smash/web/views/__init__.py | 1 +
smash/web/views/equipment.py | 14 --------------
smash/web/views/equipment_and_rooms.py | 5 +++++
8 files changed, 7 insertions(+), 35 deletions(-)
create mode 100644 smash/web/views/equipment_and_rooms.py
diff --git a/smash/web/templates/equipment_and_rooms/equipment/add.html b/smash/web/templates/equipment_and_rooms/equipment/add.html
index c73c1847..104530ac 100644
--- a/smash/web/templates/equipment_and_rooms/equipment/add.html
+++ b/smash/web/templates/equipment_and_rooms/equipment/add.html
@@ -2,11 +2,6 @@
{% load static %}
{% load filters %}
-{% block styles %}
- {{ block.super }}
- <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
{% block page_header %}New equipment definition{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/templates/equipment_and_rooms/equipment/edit.html b/smash/web/templates/equipment_and_rooms/equipment/edit.html
index df7d706b..72ac2759 100644
--- a/smash/web/templates/equipment_and_rooms/equipment/edit.html
+++ b/smash/web/templates/equipment_and_rooms/equipment/edit.html
@@ -2,11 +2,6 @@
{% load static %}
{% load filters %}
-{% block styles %}
- {{ block.super }}
- <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
{% block page_header %}Edit equipment definition{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/templates/equipment_and_rooms/rooms/add.html b/smash/web/templates/equipment_and_rooms/rooms/add.html
index f5cd36e3..36cc0a78 100644
--- a/smash/web/templates/equipment_and_rooms/rooms/add.html
+++ b/smash/web/templates/equipment_and_rooms/rooms/add.html
@@ -2,11 +2,6 @@
{% load static %}
{% load filters %}
-{% block styles %}
- {{ block.super }}
- <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
{% block page_header %}New room{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/templates/equipment_and_rooms/rooms/edit.html b/smash/web/templates/equipment_and_rooms/rooms/edit.html
index 4a7e9b9e..130720fc 100644
--- a/smash/web/templates/equipment_and_rooms/rooms/edit.html
+++ b/smash/web/templates/equipment_and_rooms/rooms/edit.html
@@ -2,11 +2,6 @@
{% load static %}
{% load filters %}
-{% block styles %}
- {{ block.super }}
- <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
{% block page_header %}Edit room{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/urls.py b/smash/web/urls.py
index fc52d712..cd0f9de0 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -121,7 +121,7 @@ urlpatterns = [
# EQUIPMENT #
####################
- url(r'^equipment_and_rooms$', views.equipment.equipment_and_rooms, name='web.views.equipment_and_rooms'),
+ url(r'^equipment_and_rooms$', views.equipment_and_rooms.equipment_and_rooms, name='web.views.equipment_and_rooms'),
url(r'^equipment_and_rooms/equipment/add$', views.equipment.equipment_add, name='web.views.equipment_add'),
url(r'^equipment_and_rooms/equipment/edit/(?P<equipment_id>\d+)$', views.equipment.equipment_edit, name='web.views.equipment_edit'),
url(r'^equipment_and_rooms/equipment/delete/(?P<equipment_id>\d+)$', views.equipment.equipment_delete, name='web.views.equipment_delete'),
diff --git a/smash/web/views/__init__.py b/smash/web/views/__init__.py
index 7870edac..235e822e 100644
--- a/smash/web/views/__init__.py
+++ b/smash/web/views/__init__.py
@@ -70,6 +70,7 @@ import visit
import doctor
import subject
import equipment
+import equipment_and_rooms
import flying_teams
import kit
import mails
diff --git a/smash/web/views/equipment.py b/smash/web/views/equipment.py
index 6db42477..ff498134 100644
--- a/smash/web/views/equipment.py
+++ b/smash/web/views/equipment.py
@@ -16,7 +16,6 @@ def equipment(request):
def equipment_add(request):
- 0 // 0
if request.method == 'POST':
form = ItemForm(request.POST)
if form.is_valid():
@@ -46,16 +45,3 @@ def equipment_delete(request, equipment_id):
the_item.delete()
return redirect('web.views.equipment')
-
-
-def equipment_add(request):
- equipment_list = Item.objects.order_by('-name')
- context = {
- 'equipment_list': equipment_list
- }
-
- return wrap_response(request, "equipment_and_rooms/equipment/index.html", context)
-
-
-def equipment_and_rooms(request):
- return wrap_response(request, "equipment_and_rooms/index.html", {})
diff --git a/smash/web/views/equipment_and_rooms.py b/smash/web/views/equipment_and_rooms.py
new file mode 100644
index 00000000..0d8092e6
--- /dev/null
+++ b/smash/web/views/equipment_and_rooms.py
@@ -0,0 +1,5 @@
+from . import wrap_response
+
+
+def equipment_and_rooms(request):
+ return wrap_response(request, "equipment_and_rooms/index.html", {})
--
GitLab