WIP

foxmask · Dec 2, 2017 · 664ff98 · 664ff98
1 parent 65ec4dc
commit 664ff98
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/django_th/static/js/th.js b/django_th/static/js/th.js
@@ -4,7 +4,7 @@
 $(document).on("click","a.btn.btn-md.btn-default", function () {
     triggerId = $(this).attr('data')
     var request = $.ajax({
-        url: Urls.fire_trigger(triggerId),
+        url: '/th/trigger/fire/' + triggerId,
         type: 'get',
         dataType: 'html',
         success: showResponse,
@@ -17,7 +17,7 @@ $(document).on("click","a.btn.btn-md.btn-default", function () {
 $(document).on("click","a.btn.btn-md.btn-primary, a.btn.btn-md.btn-success", function () {
     triggerId = $(this).attr('data')
     var request = $.ajax({
-        url: Urls.trigger_on_off(triggerId),
+        url: '/th/trigger/onoff/' + triggerId,
         type: 'get',
         dataType: 'html',
         success: showResponse,

diff --git a/django_th/templates/home.html b/django_th/templates/home.html
@@ -147,6 +147,5 @@
 {% endif %}
 {% endblock %}
 {% block extrajs %}
-<script src="{# url 'js_reverse' #}" type="text/javascript"></script>
 <script src="{% static 'js/th.js' %}" type="text/javascript"></script>
 {% endblock %}
diff --git a/django_th/urls.py b/django_th/urls.py
@@ -14,17 +14,11 @@
 from django_th.views_userservices import UserServiceDeleteView, renew_service
 from django_th.views_wizard import UserServiceWizard, finalcallback
 
-# from django_js_reverse.views import urls_js
-# from django.contrib import admin
-# admin.autodiscover()
-
 urlpatterns = [
-    # url(r'^jsreverse/$', urls_js, name='js_reverse'),
     # ****************************************
     # admin module
     # ****************************************
     path('admin/', admin.site.urls),
-    # url(r'^admin/', include(admin.site.urls), ),
     # ****************************************
     # auth module
     # ****************************************

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,9 @@
 arrow==0.10.0
 awesome-slugify==1.6.5
 djangorestframework==3.7.3
-Django==2.0rc1
+Django==2.0
 django-environ==0.4.4
+django-filter==1.1.0
 django-formtools==2.1
 django-js-reverse==0.7.3
 django-redis==4.8.0

diff --git a/setup.py b/setup.py
@@ -3,9 +3,10 @@
 
 install_requires = [
     'djangorestframework==3.7.3',
-    'Django==2.0rc1',
+    'django-filter==1.1.0',
+    'Django==2.0',
     'django-formtools==2.1',
-    'arrow==0.10.0',
+    'arrow==0.12.0',
     'django-js-reverse==0.7.3',
     'django-redis==4.8.0',
     'requests-oauthlib==0.8.0',