More work converting to django 2

tomturner · tomturner · commit 56b7cc0de07b · 2019-02-12T21:35:24.000Z
diff --git a/dashboard/gadgets/__init__.py b/dashboard/gadgets/__init__.py
@@ -8,12 +8,12 @@ def find_gadgets():
                      if not f.startswith('_') and f.endswith('.py')]
     except OSError:
         return []
-    gadgetArray = []
+    gadget_array = []
     for f in file_dict:
-        gadgetArray.append(open_gadget(f).gadget_info())
-    return gadgetArray
+        gadget_array.append(open_gadget(f).gadget_info())
+    return gadget_array
 
 
 def open_gadget(gadget):
-    g = __import__("django-dashboard.dashboard.gadgets." + gadget, globals(), locals(), ["Gadget"])
+    g = __import__("dashboard.gadgets." + gadget, globals(), locals(), ["Gadget"])
     return g.Gadget()
diff --git a/dashboard/templates/view_gadgets.html b/dashboard/templates/view_gadgets.html
@@ -5,7 +5,7 @@
 <body>
 <ul>
 {% for gadget in gadgets %}
-<li><a href="{% url dashboard_add_gadget name gadget.name %}">{{ gadget.name }}</a></li>
+<li><a href="{% url 'dashboard:add_gadget' dashboard.slug gadget.name %}">{{ gadget.name }}</a></li>
 {% endfor %}
 </ul>
 </body>
diff --git a/dashboard/urls.py b/dashboard/urls.py
@@ -15,10 +15,11 @@
 
 
 from django.urls import path
-from dashboard.views import ViewDashboard, ViewGadgets
+from dashboard.views import ViewDashboard, ViewGadgets, AddGadget
 
 app_name = 'dashboard'
 urlpatterns = [
     path('<slug:slug>/', ViewDashboard.as_view(), name='view_dashboard'),
     path('<slug:slug>/view-gadgets/', ViewGadgets.as_view(), name='view_gadgets'),
+    path('<slug:slug>/add/<str:gadget>/', AddGadget.as_view(), name="add_gadget"),
 ]
diff --git a/dashboard/views.py b/dashboard/views.py
@@ -96,11 +96,9 @@ def get_context_data(self, **kwargs):
         return context
 
 
-# # noinspection PyUnusedLocal
-# def view_gadgets(request, name):
-#     return render_to_response('view_gadgets.html', {'name': name, 'gadgets': find_gadgets()})
-#
-#
+class AddGadget(View):
+    def get(self, slug, gadget):
+        pass
 # def add_gadget(request, name, gadget):
 #     try:
 #         dashboard = models.Dashboard.objects.get(name=name, user=request.user)
