Merge pull request #462 from BCStudentSoftwareDevTeam/1321-fix_visibi…

…lity_students_admin Add permission for admin students for New Labor Status Form
BCStudentSoftwareDevTeam · Nov 18, 2024 · e48bf15 · e48bf15
2 parents 1d9d44d + 65d363e
commit e48bf15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/main_routes/laborStatusForm.py b/app/controllers/main_routes/laborStatusForm.py
@@ -27,6 +27,7 @@
 def laborStatusForm(laborStatusKey = None):
     """ Render labor Status Form, and pre-populate LaborStatusForm page with the correct information when redirected from Labor History."""
     currentUser = require_login()
+
     if not currentUser:        # Not logged in
         return render_template('errors/403.html'), 403
     if not currentUser.isLaborAdmin:

diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html
@@ -24,13 +24,17 @@ <h4>Supervisor Portal</h4>
                   </div>
               </a>
           </div>
+      {% endif %}
+      {% if currentUser.supervisor or (currentUser.student and currentUser.isLaborAdmin) %}
           <div class="panel panel-default">
             <a class="adminTest" href="/laborstatusform">
-                <div {% if request.path =="/laborstatusform" %} class="panel-heading active"{% endif %} class="panel-heading" tabindex="5">
+                <div {% if request.path == "/laborstatusform" %} class="panel-heading active"{% endif %} class="panel-heading" tabindex="5">
                       <h4>New Labor Status Form</h4>
                   </div>
               </a>
           </div>
+      {% endif %}
+      {% if currentUser.supervisor %}
           <div class="panel panel-default">
             <a class="adminTest" href="/main/search">
                 <div {% if request.path =="/main/search" %} class="panel-heading active"{% endif %} class="panel-heading" tabindex="7">