Skip to content
Snippets Groups Projects
Commit 07e184a3 authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Make the progress form make sense

parent 709fcdaf
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ from .models import ApplicationSubmission ...@@ -4,7 +4,7 @@ from .models import ApplicationSubmission
class ProgressSubmissionForm(forms.ModelForm): class ProgressSubmissionForm(forms.ModelForm):
action = forms.ChoiceField() action = forms.ChoiceField(label='Take action')
class Meta: class Meta:
model = ApplicationSubmission model = ApplicationSubmission
...@@ -15,7 +15,6 @@ class ProgressSubmissionForm(forms.ModelForm): ...@@ -15,7 +15,6 @@ class ProgressSubmissionForm(forms.ModelForm):
choices = [(action, action) for action in self.instance.phase.action_names] choices = [(action, action) for action in self.instance.phase.action_names]
action_field = self.fields['action'] action_field = self.fields['action']
action_field.choices = choices action_field.choices = choices
action_field.label = f'Current status: {self.instance.phase.name}'
self.should_show = bool(choices) self.should_show = bool(choices)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
......
{% if progress_form.should_show %} {% if progress_form.should_show %}
<div class="modal" id="update-status"> <div class="modal" id="update-status">
<h4>Update status</h4> <h4>Update status</h4>
<p>Current status: {{ object.phase.name }}</p>
<form class="form" method="post" id="progress-form"> <form class="form" method="post" id="progress-form">
{% csrf_token %} {% csrf_token %}
<div class="form__item"> <div class="form__item">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment