removing dajaxice requirement, 'manual' ajax requests

Lasanha · Mar 28, 2014 · 5920296 · 5920296
1 parent c33a86c
commit 5920296
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/escenario/settings.py b/escenario/settings.py
@@ -84,7 +84,6 @@
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-    'dajaxice.finders.DajaxiceFinder',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -136,7 +135,6 @@
     # 'django.contrib.admindocs',
     'generator',
     'south',
-    'dajaxice',
 )
 
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'

diff --git a/escenario/templates/base.html b/escenario/templates/base.html
@@ -1,8 +1,7 @@
 {% load staticfiles %}
-{% load dajaxice_templatetags %}
 <html>
 <head>
-{% dajaxice_js_import %}
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 </head>
 <body background="{% static 'background.gif' %}">
 

diff --git a/escenario/templates/list.html b/escenario/templates/list.html
@@ -14,7 +14,7 @@ <h2>FALTA!! OE PENALTI!!</h2>
         <span style="padding-right:15px;">
         <a href="{{ esc.img_id }}"><img width=300 src="{{ esc.img_id }}"  alt="{{ esc.esc.titulo  }}" ></a>
         <span style="font-size:36px;" id="span{{ esc.id }}">{{ esc.votos }}</span>
-        <input type="button" name="click{{ esc.id }}" onclick="Dajaxice.generator.vote_escimg(vote_callback, {'id': {{ esc.id }} })" value="+1"/>
+        <input type="button" name="click{{ esc.id }}" onclick="vote_callback({{ esc.id }})" value="+1"/>
         </span>
     {% endfor %}
 
@@ -40,7 +40,11 @@ <h2>FALTA!! OE PENALTI!!</h2>
 {% block scripts %}
 <script>
     function vote_callback(data){
-        document.getElementById('span' + data.id).innerHTML = data.votos;
+        result = $.get("/api/vote/" + data,
+            function(result) {
+                document.getElementById('span' + result.id).innerHTML = result.votos;
+            },
+            "json")
     }
 </script>
 {% endblock %}
diff --git a/generator/ajax.py b/generator/ajax.py
diff --git a/generator/urls.py b/generator/urls.py
@@ -1,9 +1,6 @@
 from django.conf.urls import patterns, include, url
 from views import Home, About, List, Restricted
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from dajaxice.core import dajaxice_autodiscover, dajaxice_config
-
-dajaxice_autodiscover()
 
 urlpatterns = patterns('',
     url(r'^$', Home.as_view()),
@@ -14,8 +11,7 @@
     url(r'^restricted/$', Restricted.as_view()),
     url(r'^api/list/$', 'generator.views.api_list'),
     url(r'^api/create/$', 'generator.views.api_create'),
-
-    url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
+    url(r'^api/vote/(?P<escimg_id>\d+)$', 'generator.views.api_vote'),
 )
 
 urlpatterns += staticfiles_urlpatterns()
diff --git a/generator/views.py b/generator/views.py
@@ -97,3 +97,11 @@ class Restricted(View):
     def get(self, request):
         return render(request, self.template_name, {})
 
+
+def api_vote(request, escimg_id):
+    print "called api"
+    escimg = EscImg.objects.get(id=int(escimg_id))
+    votos = escimg.gostei()
+    escimg.save()
+    result = {'id': escimg.id, 'votos': votos}
+    return HttpResponse(json.dumps(result), mimetype='application/json')
diff --git a/requirements.txt b/requirements.txt
@@ -4,8 +4,6 @@ South==0.8.2
 coverage==3.7
 dj-database-url==0.2.2
 dj-static==0.0.5
-django-dajax==0.9.2
-django-dajaxice==0.5.5
 django-toolbelt==0.0.1
 gunicorn==18.0
 mock==1.0.1