From 415f147d367c83894bf5bcf1aca9c36c07a86782 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Thu, 20 Oct 2016 21:28:50 -0300
Subject: [PATCH] Fixing professor permissions and relation error

---
 courses/templates/course/view.html | 50 +++++++++++++++++++++++++++-----------------------
 courses/views.py                   |  2 +-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 640e70b..6a35636 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -28,7 +28,7 @@
         </div>
     </div>
 
-{% if user|has_role:'professor' or user|has_role:'system_admin' %}
+{% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
 
     <div class="panel panel-primary navigation">
     <div class="panel-heading">
@@ -56,7 +56,7 @@
           <div class="col-xs-8 col-md-10 titleTopic">
             <h4>{{course}}</h4>
           </div>
-          {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+          {% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
             <div class="col-xs-4 col-md-2" id="divMoreActions">
               <div class="btn-group">
                 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -199,17 +199,19 @@
                   <h4 style="color:white">{{subject.name}}</h4>
                   </a>
                 </div>
-                <div class="col-xs-3 col-md-2" id="divMoreActions">
-                  <div class="btn-group">
-                    <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                      <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="moreActions">
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
-                    </ul>
+                {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
+                  <div class="col-xs-3 col-md-2" id="divMoreActions">
+                    <div class="btn-group">
+                      <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="moreActions">
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                      </ul>
+                    </div>
                   </div>
-                </div>
+                {% endif %}
             </div>
           </div>
           <div class="panel-body">
@@ -244,17 +246,19 @@
                   <h4 style="color:white">{{subject.name}}</h4>
                   </a>
                 </div>
-                <div class="col-xs-3 col-md-2" id="divMoreActions">
-                  <div class="btn-group">
-                    <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                      <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="moreActions">
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
-                      <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
-                    </ul>
+                {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
+                  <div class="col-xs-3 col-md-2" id="divMoreActions">
+                    <div class="btn-group">
+                      <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                      </button>
+                      <ul class="dropdown-menu" aria-labelledby="moreActions">
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
+                        <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
+                      </ul>
+                    </div>
                   </div>
-                </div>
+                {% endif %}
             </div>
           </div>
           <div class="panel-body">
@@ -281,7 +285,7 @@
         {% endfor %}
   {% endif %}
 
-{% if  user|has_role:'professor' or user|has_role:'system_admin' %}
+{% if  user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
 
     <div class="form-group">
     <a href="{% url 'course:create_subject' course.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
diff --git a/courses/views.py b/courses/views.py
index 492c846..defb050 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -187,7 +187,7 @@ class CourseView(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 		if has_role(self.request.user,'system_admin'):
 			courses = Course.objects.all()
 		elif has_role(self.request.user,'professor'):
-			courses = self.request.user.courses.all()
+			courses = self.request.user.courses_professors.all()
 		elif has_role(self.request.user, 'student'):
 			courses = self.request.user.courses_student.all()
 
--
libgit2 0.21.2