inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move forms into forms.py

Browse source
This commit is contained in:
Élie Bouttier 2014-08-05 23:54:17 -07:00
parent be9f657e4b
commit 374e5372d1
2 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
issue/forms.py Normal file
View file

@ -0,0 +1,28 @@
from django import forms
from django.forms.models import modelform_factory
from bootstrap3_datetime.widgets import DateTimePicker
from django_markdown.widgets import MarkdownWidget
from issue.models import *
AddProjectForm = modelform_factory(Project, fields=['display_name', 'name', 'description'])
EditProjectForm = modelform_factory(Project, fields=['display_name', 'description'])
LabelForm = modelform_factory(Label, fields=['name', 'color', 'inverted'])
class MilestoneForm(forms.ModelForm):
class Meta:
model = Milestone
fields = ['name', 'due_date']
widgets = {
'due_date': DateTimePicker(format="YYYY-MM-DD HH:mm"),
}
class IssueForm(forms.Form):
title = forms.CharField(max_length=128)
description = forms.CharField(widget=MarkdownWidget, required=False)
class CommentForm(forms.Form):
comment = forms.CharField(widget=MarkdownWidget)

35
issue/views.py
View file

@ -1,14 +1,12 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django import forms
from django.forms.models import modelform_factory
from django.contrib import messages from django.contrib import messages
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from issue.models import *
from django_markdown.widgets import MarkdownWidget
from stronghold.decorators import public from stronghold.decorators import public
from bootstrap3_datetime.widgets import DateTimePicker
from issue.models import *
from issue.forms import *
@public @public
@ -24,8 +22,7 @@ def project_list(request):
def project_add(request): def project_add(request):
ProjectForm = modelform_factory(Project, fields=['display_name', 'name', 'description']) form = AddProjectForm(request.POST or None)
form = ProjectForm(request.POST or None)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
@ -53,8 +50,7 @@ def project_edit(request, project):
project = get_object_or_404(Project, name=project) project = get_object_or_404(Project, name=project)
ProjectForm = modelform_factory(Project, fields=['display_name', 'description']) form = EditProjectForm(request.POST or None, instance=project)
form = ProjectForm(request.POST or None, instance=project)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
@ -206,11 +202,6 @@ def issue_edit(request, project, issue=None):
issue = None issue = None
init_data = None init_data = None
class IssueForm(forms.Form):
title = forms.CharField(max_length=128)
description = forms.CharField(widget=MarkdownWidget, required=False)
form = IssueForm(request.POST or init_data) form = IssueForm(request.POST or init_data)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
@ -292,10 +283,6 @@ def issue_comment(request, project, issue, comment=None):
event = None event = None
init_data = None init_data = None
class CommentForm(forms.Form):
comment = forms.CharField(widget=MarkdownWidget)
form = CommentForm(request.POST or init_data) form = CommentForm(request.POST or init_data)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
@ -427,7 +414,6 @@ def label_edit(request, project, id=None):
else: else:
label = None label = None
LabelForm = modelform_factory(Label, fields=['name', 'color', 'inverted'])
form = LabelForm(request.POST or None, instance=label) form = LabelForm(request.POST or None, instance=label)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
@ -513,15 +499,6 @@ def milestone_edit(request, project, name=None):
else: else:
milestone = None milestone = None
class MilestoneForm(forms.ModelForm):
class Meta:
model = Milestone
fields = ['name', 'due_date']
widgets = {
'due_date': DateTimePicker(format="YYYY-MM-DD HH:mm"),
}
form = MilestoneForm(request.POST or None, instance=milestone) form = MilestoneForm(request.POST or None, instance=milestone)
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():