Kaynağa Gözat

Removed warnings and removed hard URLS

Denis Merigoux 9 yıl önce
ebeveyn
işleme
d63c4f2a58

+ 3 - 3
counter/templates/counterTemplate.html

@@ -20,14 +20,14 @@
20 20
           <div class="text-center">
21 21
             <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="getElementById('counter{{counter.id}}').style.display='inline';getElementById('button{{counter.id}}').style.display='none';">Remettre à zéro</button>
22 22
           </div>
23
-          <form style="display:none" id="counter{{counter.id}}" action="/reset-counter/" method="post">
23
+          <form style="display:none" id="counter{{counter.id}}" action="{% url 'reset-counter' %}" method="post">
24 24
             {% csrf_token %}
25 25
             <div class="form-group">
26 26
               <label for="reason">Motif du seum :</label>
27 27
               <textarea class="form-control" name="reason"></textarea>
28 28
             </div>
29 29
             <input type="hidden" name="counter" value="{{counter.id}}"></input>
30
-            <input type="hidden" name="redirect" value="counter/{{counter.id}}"></input>
30
+            <input type="hidden" name="redirect" value="{% url 'counter' id_counter=counter.id %}"></input>
31 31
             <div class="text-center">
32 32
               <button type="submit" class="btn btn-default btn-success">Foutre le seum</button>
33 33
             </div>
@@ -47,7 +47,7 @@
47 47
     </div>
48 48
   </div>
49 49
   <div class="text-center">
50
-    <a class="btn btn-success" href="{% url 'counter.views.home' %}">Retour à la liste des compteurs</a>
50
+    <a class="btn btn-success" href="{% url 'home' %}">Retour à la liste des compteurs</a>
51 51
   </div>
52 52
 </div>
53 53
 {% endblock %}

+ 3 - 3
counter/templates/homeTemplate.html

@@ -8,7 +8,7 @@
8 8
 		<div class="col-md-4 col-sm-6 col-lg-3">
9 9
 			<div class="panel panel-primary">
10 10
 				<div class="panel-heading">
11
-					<a class="counter-link" href="{% url 'counter.views.counter' id_counter=counter.id %}"><h2 class="panel-title">{{ counter.trigramme }} <small>{{ counter.name }}</small></h2></a>
11
+					<a class="counter-link" href="{% url 'counter' id_counter=counter.id %}"><h2 class="panel-title">{{ counter.trigramme }} <small>{{ counter.name }}</small></h2></a>
12 12
 				</div>
13 13
 				<div class="seum-counter panel-body">
14 14
 					{% if counter.lastReset.noSeum %}
@@ -21,14 +21,14 @@
21 21
 					<div class="text-center">
22 22
 						<button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="getElementById('counter{{counter.id}}').style.display='inline';getElementById('button{{counter.id}}').style.display='none';">Remettre à zéro</button>
23 23
 					</div>
24
-					<form style="display:none" id="counter{{counter.id}}" action="/reset-counter/" method="post">
24
+					<form style="display:none" id="counter{{counter.id}}" action="{% url 'reset-counter' %}" method="post">
25 25
 						{% csrf_token %}
26 26
 						<div class="form-group">
27 27
 							<label for="reason">Motif du seum :</label>
28 28
 							<textarea class="form-control" name="reason"></textarea>
29 29
 						</div>
30 30
 						<input type="hidden" name="counter" value="{{counter.id}}"></input>
31
-						<input type="hidden" name="redirect" value="home"></input>
31
+						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
32 32
 						<div class="text-center">
33 33
 							<button type="submit" class="btn btn-default btn-success">Foutre le seum</button>
34 34
 						</div>

+ 3 - 3
counter/urls.py

@@ -4,7 +4,7 @@ from . import views
4 4
 
5 5
 urlpatterns = [
6 6
     url(r'^$', views.home),
7
-    url(r'^seum/', views.home),
8
-    url(r'^reset-counter/',views.resetCounter),
9
-    url(r'^counter/(?P<id_counter>\d+)$', views.counter),
7
+    url(r'^seum/', views.home, name="home"),
8
+    url(r'^reset-counter/',views.resetCounter,name="reset-counter"),
9
+    url(r'^counter/(?P<id_counter>\d+)$', views.counter, name="counter"),
10 10
 ]

+ 3 - 2
counter/views.py

@@ -9,6 +9,7 @@ from graphos.renderers import gchart
9 9
 from graphos.sources.simple import SimpleDataSource
10 10
 from graphos.sources.model import ModelDataSource
11 11
 import random
12
+from django.utils import timezone
12 13
 
13 14
 class resetCounterForm(forms.ModelForm):
14 15
     class Meta:
@@ -47,7 +48,7 @@ def home(request):
47 48
 
48 49
     ###Timeline graph
49 50
     #Data pre-processing
50
-    resets = Reset.objects.filter(timestamp__gte=datetime.now() - timedelta(days=1))
51
+    resets = Reset.objects.filter(timestamp__gte=timezone.now() - timedelta(days=1))
51 52
     for reset in resets:
52 53
         reset.timestamp={'v' : reset.timestamp.timestamp(), 'f' : "Il y a "+format_timedelta(datetime.now()-reset.timestamp.replace(tzinfo=None),locale='fr',threshold=1) }
53 54
         reset.Seum={'v' : 0, 'f' : reset.counter.trigramme+" : "+reset.reason}
@@ -77,7 +78,7 @@ def resetCounter(request):
77 78
         reset.timestamp = datetime.now()
78 79
         reset.save()
79 80
         # check whether it's valid
80
-    return HttpResponseRedirect('/'+data['redirect'][0])
81
+    return HttpResponseRedirect(data['redirect'][0])
81 82
 
82 83
 def counter(request, id_counter):
83 84