Atividade.doc
- {% if user|has_role:'professor, system_admin' %}
+ {% professor_subject subject user as permi_test%}
+ {% if permi_test %}
Nota:
{% trans "Answer" %}
+{% trans "Answer" %}
{% endif %}
{% endblock button_save %}
diff --git a/poll/templatetags/professor_access.py b/poll/templatetags/professor_access.py
new file mode 100644
index 0000000..ab556bc
--- /dev/null
+++ b/poll/templatetags/professor_access.py
@@ -0,0 +1,14 @@
+from django import template
+from rolepermissions.verifications import has_role
+
+register = template.Library()
+
+@register.simple_tag
+def professor_subject(subject, user):
+ if (has_role(user,'system_admin')):
+ return True
+
+ if (user in subject.professors.all()):
+ return True
+
+ return False
diff --git a/poll/tests/poll.py b/poll/tests/poll.py
index d6f8bf2..6fd3f89 100644
--- a/poll/tests/poll.py
+++ b/poll/tests/poll.py
@@ -80,21 +80,23 @@ class PollTestCase(TestCase):
self.poll.save()
def test_poll_create(self):
- self.client.login(username='professor', password='testing')
- poll = self.topic.activities.all().count()
url = reverse('course:poll:create_poll',kwargs={'slug':self.topic.slug})
data = {
"name": 'create poll test',
"limit_date":'2016-10-06',
"all_students":True,
}
- response = self.client.post(url, data)
- self.assertEqual(poll + 1, self.topic.activities.all().count()) # create a new poll
+
self.client.login(username='student', password='testing')
poll = self.topic.activities.all().count()
response = self.client.post(url, data)
self.assertEqual(poll, self.topic.activities.all().count()) # don't create a new poll
+ self.client.login(username='professor', password='testing')
+ poll = self.topic.activities.all().count()
+ response = self.client.post(url, data)
+ self.assertEqual(poll + 1, self.topic.activities.all().count()) # create a new poll
+
def test_poll_update(self):
self.client.login(username='professor', password='testing')
url = reverse('course:poll:update_poll',kwargs={'slug':self.poll.slug})
diff --git a/poll/views.py b/poll/views.py
index cd3c574..6006c6d 100644
--- a/poll/views.py
+++ b/poll/views.py
@@ -145,6 +145,8 @@ class UpdatePoll(LoginRequiredMixin,HasRoleMixin,generic.UpdateView):
context['subject'] = poll.topic.subject
context['subjects'] = poll.topic.subject.course.subjects.all()
+ print (self.request.user)
+
answers = {}
for answer in poll.answers.all():
# print (key.answer)
diff --git a/users/admin.py b/users/admin.py
index ef1173f..803b76c 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -5,6 +5,5 @@ from .forms import AdminUserForm
class UserAdmin(admin.ModelAdmin):
list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
search_fields = ['username', 'name', 'email']
- form = AdminUserForm
-admin.site.register(User, UserAdmin)
\ No newline at end of file
+admin.site.register(User, UserAdmin)
--
libgit2 0.21.2