me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 11:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: error when viewing profile with no answerset

Browse Source
This commit is contained in:
James Graham
2021-03-10 15:03:24 +00:00
parent 667a51d1c7
commit 3ad8d4a5c9
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
people/templates/people/organisation/detail.html
View File

@@ -62,6 +62,12 @@
<td>{{ answers }}</td> <td>{{ answers }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% if answer_set is None %}
<tr>
<td colspan="2">No answers</td>
</tr>
{% endif %}
</tbody> </tbody>
</table> </table>

6
people/templates/people/person/includes/answer_set_full.html
View File

@@ -37,6 +37,12 @@
<td>{{ answers }}</td> <td>{{ answers }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% if answer_set is None %}
<tr>
<td colspan="2">No answers</td>
</tr>
{% endif %}
</tbody> </tbody>
</table> </table>

6
people/templates/people/person/includes/answer_set_partial.html
View File

@@ -21,6 +21,12 @@
<td>{{ answers }}</td> <td>{{ answers }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% if answer_set is None %}
<tr>
<td colspan="2">No answers</td>
</tr>
{% endif %}
</tbody> </tbody>
</table> </table>

11
people/views/organisation.py
View File

@@ -114,9 +114,14 @@ class OrganisationDetailView(LoginRequiredMixin, DetailView):
questions = questions.filter(answer_is_public=True) questions = questions.filter(answer_is_public=True)
question_answers = {} question_answers = {}
for question in questions: try:
answers = answer_set.question_answers.filter(question=question) for question in questions:
question_answers[str(question)] = ', '.join(map(str, answers)) answers = answer_set.question_answers.filter(question=question)
question_answers[str(question)] = ', '.join(map(str, answers))
except AttributeError:
# No AnswerSet yet
pass
return question_answers return question_answers

11
people/views/person.py
View File

@@ -79,9 +79,14 @@ class ProfileView(LoginRequiredMixin, DetailView):
questions = questions.filter(answer_is_public=True) questions = questions.filter(answer_is_public=True)
question_answers = {} question_answers = {}
for question in questions: try:
answers = answer_set.question_answers.filter(question=question) for question in questions:
question_answers[str(question)] = ', '.join(map(str, answers)) answers = answer_set.question_answers.filter(question=question)
question_answers[str(question)] = ', '.join(map(str, answers))
except AttributeError:
# No AnswerSet yet
pass
return question_answers return question_answers