Denis Merigoux лет назад: 9
Родитель
Сommit
25f2b8bedb
2 измененных файлов с 8 добавлено и 7 удалено
  1. 2 2
      counter/templates/homeTemplate.html
  2. 6 5
      counter/views.py

+ 2 - 2
counter/templates/homeTemplate.html

51
 		<div class="col-sm-6">
51
 		<div class="col-sm-6">
52
 			<div class="panel panel-primary">
52
 			<div class="panel panel-primary">
53
 				<div class="panel-heading">
53
 				<div class="panel-heading">
54
-					<h2 class="panel-title">QuickSeum™ <small>Brise le mur du seum</small></h2>
54
+					<h2 class="panel-title"><b>QuickSeum™</b> <small>Brise le mur du seum</small></h2>
55
 				</div>
55
 				</div>
56
 				<div class="primary-counter panel-body">
56
 				<div class="primary-counter panel-body">
57
 					<form class="form-horizontal" action="{% url 'reset-counter'%}" method="POST" style="width:100%;">
57
 					<form class="form-horizontal" action="{% url 'reset-counter'%}" method="POST" style="width:100%;">
73
 								<button type="submit" class="btn btn-danger">Foutre le seum</button>
73
 								<button type="submit" class="btn btn-danger">Foutre le seum</button>
74
 							</div>
74
 							</div>
75
 						</div>
75
 						</div>
76
-						<input type="hidden" name="counter" value="{{myCounter.id}}"></input>
76
+						<input type="hidden" name="who" value="{{myCounter.id}}"></input>
77
 						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
77
 						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
78
 					</form>
78
 					</form>
79
 				</div>
79
 				</div>

+ 6 - 5
counter/views.py

242
         # create a form instance and populate it with data from the request:
242
         # create a form instance and populate it with data from the request:
243
         data = dict(request.POST)
243
         data = dict(request.POST)
244
 
244
 
245
-        counter = Counter.objects.get(pk=int(data['counter'][0]))
246
-        if 'who' in data.keys():
247
-            who = Counter.objects.get(pk=int(data['who'][0]))
245
+        who = Counter.objects.get(pk=int(data['who'][0]))
246
+        if 'counter' in data.keys():
247
+            counter = Counter.objects.get(pk=int(data['counter'][0]))
248
         else:
248
         else:
249
             try:
249
             try:
250
-                who = Counter.objects.get(trigramme=data['trigramme'][0])
250
+                counter = Counter.objects.get(trigramme=data['trigramme'][0])
251
             except Counter.DoesNotExist:
251
             except Counter.DoesNotExist:
252
                 return HttpResponseRedirect(data['redirect'][0])
252
                 return HttpResponseRedirect(data['redirect'][0])
253
         reset = Reset()
253
         reset = Reset()
257
         reset.timestamp = datetime.now()
257
         reset.timestamp = datetime.now()
258
 
258
 
259
         # we check that the seumer is the autenticated user
259
         # we check that the seumer is the autenticated user
260
-        if reset.counter.id != request.user.id:
260
+        if (reset.who.user is None or
261
+                reset.who.user.id != request.user.id):
261
             return HttpResponseRedirect(data['redirect'][0])
262
             return HttpResponseRedirect(data['redirect'][0])
262
 
263
 
263
         reset.save()
264
         reset.save()