From 5d896b19742e056ec3aedcddc201a4d610bcb6fd Mon Sep 17 00:00:00 2001 From: orbitroom Date: Thu, 11 Feb 2016 22:32:24 -0500 Subject: [PATCH] Removed Duplicate Forms --- optimer/form.py | 12 +----------- optimer/views.py | 6 +++--- sigtracker/form.py | 14 -------------- sigtracker/views.py | 6 +++--- 4 files changed, 7 insertions(+), 31 deletions(-) diff --git a/optimer/form.py b/optimer/form.py index 0c77a2a6..b33c5efd 100644 --- a/optimer/form.py +++ b/optimer/form.py @@ -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") + diff --git a/optimer/views.py b/optimer/views.py index f9cd75c7..6d130fe3 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -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)) diff --git a/sigtracker/form.py b/sigtracker/form.py index 6cdb21fc..60a9a6a1 100644 --- a/sigtracker/form.py +++ b/sigtracker/form.py @@ -20,21 +20,7 @@ class SignatureForm(forms.Form): notes = forms.CharField(max_length=254, label="Notes", required=False, initial="") -class SignatureUpdateForm(forms.Form): - sigtype = [('Wormhole', 'Wormhole'), ('Combat', 'Combat'), ('Data', 'Data'), - ('Relic', 'Relic'), ('Gas', 'Gas'), ('Ore', 'Ore')] - status = [('Open', 'Open'), ('Started', 'Started'), ('Finished', 'Finished'), ('Life cycle has not begun', 'Life cycle has not begun'), - ('Probably wont last another day', 'Probably wont last another day'), ('End of its natural lifetime', 'End of its natural lifetime'), - ('stability not significantly disrupted', 'stability not significantly disrupted'), - ('Stability reduced not critical degree yet', 'Stability reduced not critical degree yet'), - ('Wormhole stability critically disrupted', 'Wormhole stability critically disrupted')] - system = forms.CharField(max_length=254, required=True, label='System') - ident = forms.CharField(max_length=254, required=True, label="ID") - sigtype = forms.ChoiceField(choices=sigtype, required=True, label="Signature Type") - destination = forms.CharField(max_length=254, label="destination", required=True, initial="") - status = forms.ChoiceField(choices=status, required=True, label="Status") - notes = forms.CharField(max_length=254, label="Notes", required=False, initial="") diff --git a/sigtracker/views.py b/sigtracker/views.py index 570ad302..ddfc4d18 100644 --- a/sigtracker/views.py +++ b/sigtracker/views.py @@ -12,7 +12,7 @@ from authentication.managers import AuthServicesInfoManager from eveonline.managers import EveManager from form import SignatureForm from models import sigtracker -from form import SignatureUpdateForm + import logging @@ -86,7 +86,7 @@ def edit_signature(request, sigtracker_id): logger.debug("edit_optimer called by user %s for optimer id %s" % (request.user, sigtracker_id)) sig = get_object_or_404(sigtracker, id=sigtracker_id) if request.method == 'POST': - form = SignatureUpdateForm(request.POST) + form = SignatureForm(request.POST) logger.debug("Received POST request containing update sigtracker form, is valid: %s" % form.is_valid()) if form.is_valid(): auth_info = AuthServicesInfoManager.get_auth_service_info(request.user) @@ -112,5 +112,5 @@ def edit_signature(request, sigtracker_id): 'status': sig.status, 'notes': sig.notes, } - form = SignatureUpdateForm(initial= data) + form = SignatureForm(initial= data) return render_to_response('registered/signatureupdate.html', {'form':form}, context_instance=RequestContext(request)) \ No newline at end of file