diff --git a/poll/models.py b/poll/models.py index d7b8336..0a35b3a 100644 --- a/poll/models.py +++ b/poll/models.py @@ -14,7 +14,7 @@ class Poll(Activity): verbose_name_plural = _('Polls') def __str__(self): - return str(self.question) + str("/") + str(self.topic) + return str(self.name) + str("/") + str(self.topic) class Answer(models.Model): answer = models.CharField(_("Answer"), max_length = 200) @@ -27,4 +27,4 @@ class Answer(models.Model): verbose_name_plural = _('Answers') def __str__(self): - return str(self.question) + str("/") + str(self.topic) + return str(self.answer) + str("/") + str(self.poll) diff --git a/poll/permissions.py b/poll/permissions.py new file mode 100644 index 0000000..a124836 --- /dev/null +++ b/poll/permissions.py @@ -0,0 +1,12 @@ +from rolepermissions.permissions import register_object_checker +from amadeus.roles import SystemAdmin + +@register_object_checker() +def edit_poll(role, user, poll): + if (role == SystemAdmin): + return True + + if (user in poll.topic.subject.professors.all()): + return True + + return False diff --git a/poll/templates/poll/create_update.html b/poll/templates/poll/create_update.html new file mode 100644 index 0000000..24ecfbe --- /dev/null +++ b/poll/templates/poll/create_update.html @@ -0,0 +1,173 @@ +{% extends "topic/index.html" %} + +{% load i18n widget_tweaks dict_access static%} + +{% block style %} + +{% endblock %} + +{% block content %} + +