Skip to content
Snippets Groups Projects
Commit 5738ce06 authored by Parbhat Puri's avatar Parbhat Puri Committed by Fredrik Jonsson
Browse files

Prefill only text values

parent 0d715e53
No related branches found
No related tags found
No related merge requests found
...@@ -293,8 +293,8 @@ class RoundBase(WorkflowStreamForm, SubmittableStreamForm): # type: ignore ...@@ -293,8 +293,8 @@ class RoundBase(WorkflowStreamForm, SubmittableStreamForm): # type: ignore
try: try:
submission = submission_class.objects.get(id=copy_open_submission) submission = submission_class.objects.get(id=copy_open_submission)
if self.get_parent() == submission.page and submission.status in OPEN_CALL_PHASES: if self.get_parent() == submission.page and submission.status in OPEN_CALL_PHASES:
first_group_blocks = submission.first_group_normal_blocks first_group_text_blocks = submission.first_group_normal_text_blocks
for field_id in first_group_blocks: for field_id in first_group_text_blocks:
field_data = submission.data(field_id) field_data = submission.data(field_id)
initial_values[field_id] = field_data initial_values[field_id] = field_data
......
...@@ -125,9 +125,11 @@ class AccessFormData: ...@@ -125,9 +125,11 @@ class AccessFormData:
yield field_id yield field_id
@property @property
def first_group_question_field_ids(self): def first_group_question_text_field_ids(self):
for field_id, field in self.fields.items(): for field_id, field in self.fields.items():
if isinstance(field.block, GroupToggleBlock): if isinstance(field.block, (FileFieldBlock, ImageFieldBlock, MultiFileFieldBlock)):
continue
elif isinstance(field.block, GroupToggleBlock):
break break
elif isinstance(field.block, FormFieldBlock): elif isinstance(field.block, FormFieldBlock):
yield field_id yield field_id
...@@ -166,10 +168,10 @@ class AccessFormData: ...@@ -166,10 +168,10 @@ class AccessFormData:
] ]
@property @property
def first_group_normal_blocks(self): def first_group_normal_text_blocks(self):
return [ return [
field_id field_id
for field_id in self.first_group_question_field_ids for field_id in self.first_group_question_text_field_ids
if field_id not in self.named_blocks if field_id not in self.named_blocks
] ]
...@@ -196,10 +198,10 @@ class AccessFormData: ...@@ -196,10 +198,10 @@ class AccessFormData:
for field_id in self.normal_blocks for field_id in self.normal_blocks
] ]
def render_first_group_answers(self): def render_first_group_text_answers(self):
return [ return [
self.render_answer(field_id, include_question=True) self.render_answer(field_id, include_question=True)
for field_id in self.first_group_normal_blocks for field_id in self.first_group_normal_text_blocks
] ]
def render_text_blocks_answers(self): def render_text_blocks_answers(self):
...@@ -214,5 +216,5 @@ class AccessFormData: ...@@ -214,5 +216,5 @@ class AccessFormData:
# Returns a safe string of the rendered answers # Returns a safe string of the rendered answers
return mark_safe(''.join(self.render_answers())) return mark_safe(''.join(self.render_answers()))
def output_first_group_answers(self): def output_first_group_text_answers(self):
return mark_safe(''.join(self.render_first_group_answers())) return mark_safe(''.join(self.render_first_group_text_answers()))
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<span>{{ submission.get_full_name_display }}</span> <span>{{ submission.get_full_name_display }}</span>
</section> </section>
{{ submission.output_first_group_answers }} {{ submission.output_first_group_text_answers }}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
......
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