Removed Duplicate Forms

This commit is contained in:
orbitroom
2016-02-11 22:32:24 -05:00
parent 7243f36300
commit 5d896b1974
4 changed files with 7 additions and 31 deletions

View File

@@ -15,14 +15,4 @@ class opForm(forms.Form):
details = forms.CharField(max_length=254, required=False, label="Extra Details")
class optimerUpdateForm(forms.Form):
doctrine = forms.CharField(max_length=254, required=True, label='Doctrine')
system = forms.CharField(max_length=254, required=True, label="System")
location = forms.CharField(max_length=254, required=True, label="Location")
start = forms.DateTimeField(required=True, label="Start Time MM/DD/YYYY HH:MM:SS")
duration = forms.CharField(max_length=254, required=True, label="Duration")
operation_name = forms.CharField(max_length=254, required=True, label="Operation Name")
fc = forms.CharField(max_length=254, required=True, label="Fleet Commander")
details = forms.CharField(max_length=254, required=False, label="Extra Details")

View File

@@ -14,7 +14,7 @@ from authentication.managers import AuthServicesInfoManager
from eveonline.managers import EveManager
from form import opForm
from models import optimer
from form import optimerUpdateForm
import logging
@@ -90,7 +90,7 @@ def edit_optimer(request, optimer_id):
logger.debug("edit_optimer called by user %s for optimer id %s" % (request.user, optimer_id))
op = get_object_or_404(optimer, id=optimer_id)
if request.method == 'POST':
form = optimerUpdateForm(request.POST)
form = opForm(request.POST)
logger.debug("Received POST request containing update optimer form, is valid: %s" % form.is_valid())
if form.is_valid():
auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
@@ -120,5 +120,5 @@ def edit_optimer(request, optimer_id):
'fc': op.fc,
'details': op.details,
}
form = optimerUpdateForm(initial= data)
form = opForm(initial= data)
return render_to_response('registered/optimerupdate.html', {'form':form}, context_instance=RequestContext(request))