From 76337f585a8f21efcc50ab0df46c2b6dfa2c19ce Mon Sep 17 00:00:00 2001
From: EnErvjEEk <vjeek@kaliostro.com>
Date: Wed, 28 May 2008 02:07:01 +0400
Subject: [PATCH] 	modified:   katrin-web/katrin/models.py - change
 adminid type 	modified:   katrin-web/katrin/views.py - add save operatorid &
 fix anonymous login

---
 katrin-web/katrin/models.py      | 4 +++-
 katrin-web/katrin/views.py       | 9 +++++++--
 katrin-web/templates/refill.html | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/katrin-web/katrin/models.py b/katrin-web/katrin/models.py
index 7c89c59..3caa15d 100644
--- a/katrin-web/katrin/models.py
+++ b/katrin-web/katrin/models.py
@@ -2,6 +2,8 @@
 
 from django.db import models
 from datetime import datetime
+from django.contrib.auth.models import User
+
 
 class Tariffs(models.Model):
 	id = models.IntegerField(primary_key=True)
@@ -58,7 +60,7 @@ class Users(models.Model):
 class RefillLog(models.Model):
 	id = models.AutoField(primary_key=True)
 	datetime = models.DateTimeField(default=datetime.now())
-	adminid = models.CharField(max_length=20)
+	adminid = models.ForeignKey(User,db_column='adminid')
 	userid = models.ForeignKey(Users,db_column='userid')
 	refill_size = models.DecimalField("Пополнено на",max_digits=5, decimal_places=2, help_text='Размер пополнения')
 	class Meta:
diff --git a/katrin-web/katrin/views.py b/katrin-web/katrin/views.py
index f997c52..d4c1db8 100644
--- a/katrin-web/katrin/views.py
+++ b/katrin-web/katrin/views.py
@@ -2,16 +2,19 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from katrin.models import Users, RefillLog
+from django.contrib.auth.models import User
+from django.http import HttpResponseRedirect
 
 def refill(request):
+    if request.user.is_authenticated():
 	if (request.method == 'POST'):
 		refill_size = float(request.POST['refill_size'])
 		user = Users.objects.get(pk=request.POST['userid'])
 		user.balance = user.balance + refill_size
 		user.save()
-		operator = request.POST['operator_name']
+		operator=request.user.id
 		refill_log = RefillLog(
-						adminid = operator,
+						adminid = User.objects.get(pk=request.user.id),
 						userid = user,
 						refill_size = refill_size)
 		refill_log.save()
@@ -28,3 +31,5 @@ def refill(request):
 						'users':users,
 						},
 						context_instance=RequestContext(request))
+    else: 
+	    return HttpResponseRedirect("../../../admin/")
\ No newline at end of file
diff --git a/katrin-web/templates/refill.html b/katrin-web/templates/refill.html
index 52b515e..fe55d67 100644
--- a/katrin-web/templates/refill.html
+++ b/katrin-web/templates/refill.html
@@ -15,7 +15,7 @@
 </select>
 <br>
 Пополнить баланс на <input type=text size=5 name="refill_size" value=0><br>
-<input type=hidden name=operator_name value={{user.username}}><input type=submit value="OK">
+<input type=submit value="OK">
 </form>
 
 {% endblock %}
-- 
2.11.4.GIT