Tickets #6 and #7 + bugfixes

This commit is contained in:
tonio
2009-06-09 15:45:17 +02:00
parent fa71cadd0c
commit 428cd4f143
9 changed files with 64 additions and 18 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ from mailng.admin.models import Mailbox
class ARmessage(models.Model):
mbox = models.ForeignKey(Mailbox)
last_sent = models.DateField()
last_sent = models.DateField(auto_now=True)
subject = models.CharField(max_length=255)
content = models.TextField()
enabled = models.BooleanField()
+20 -1
View File
@@ -5,6 +5,8 @@ from django.contrib.auth.decorators \
import login_required
from mailng.lib import _render
from forms import ARmessageForm
from models import ARmessage
from admin.models import Mailbox
@login_required
def index(request):
@@ -12,7 +14,24 @@ def index(request):
@login_required
def autoreply(request):
form = ARmessageForm()
mb = Mailbox.objects.get(user=request.user.id)
try:
arm = ARmessage.objects.get(mbox=mb.id)
except ARmessage.DoesNotExist:
arm = None
if request.method == "POST":
if arm:
form = ARmessageForm(request.POST, instance=arm)
else:
form = ARmessageForm(request.POST)
error = None
if form.is_valid():
arm = form.save(commit=False)
arm.mbox = mb
arm.save()
form = ARmessageForm(instance=arm)
return _render(request, "main/autoreply.html", {
"form" : form
})