Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 22:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed Duplicate Forms

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
optimer/form.py
View File

@ -16,13 +16,3 @@ class opForm(forms.Form):
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")

6
optimer/views.py
View File

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

16
sigtracker/form.py
View File

@ -20,21 +20,7 @@ class SignatureForm(forms.Form):
notes = forms.CharField(max_length=254, label="Notes", required=False, initial="") 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="")

6
sigtracker/views.py
View File

@ -12,7 +12,7 @@ from authentication.managers import AuthServicesInfoManager
from eveonline.managers import EveManager from eveonline.managers import EveManager
from form import SignatureForm from form import SignatureForm
from models import sigtracker from models import sigtracker
from form import SignatureUpdateForm
import logging 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)) 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) sig = get_object_or_404(sigtracker, id=sigtracker_id)
if request.method == 'POST': 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()) logger.debug("Received POST request containing update sigtracker form, is valid: %s" % form.is_valid())
if form.is_valid(): if form.is_valid():
auth_info = AuthServicesInfoManager.get_auth_service_info(request.user) auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
@ -112,5 +112,5 @@ def edit_signature(request, sigtracker_id):
'status': sig.status, 'status': sig.status,
'notes': sig.notes, 'notes': sig.notes,
} }
form = SignatureUpdateForm(initial= data) form = SignatureForm(initial= data)
return render_to_response('registered/signatureupdate.html', {'form':form}, context_instance=RequestContext(request)) return render_to_response('registered/signatureupdate.html', {'form':form}, context_instance=RequestContext(request))