From e9fedf3e5cd63aea4da7a71f6647ee427c62fa49 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 5 Dec 2015 20:31:27 -0500
Subject: Rewrite of the authentication and authorization system

---
 app/Template/task/layout.php  | 2 +-
 app/Template/task/show.php    | 5 ++++-
 app/Template/task/sidebar.php | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/Template/task')

diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 6b6e827a..0ceb9706 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -9,7 +9,7 @@
                 <i class="fa fa-calendar fa-fw"></i>
                 <?= $this->url->link(t('Back to the calendar'), 'calendar', 'show', array('project_id' => $task['project_id'])) ?>
             </li>
-            <?php if ($this->user->isProjectManagementAllowed($task['project_id'])): ?>
+            <?php if ($this->user->hasProjectAccess('project', 'edit', $task['project_id'])): ?>
             <li>
                 <i class="fa fa-cog fa-fw"></i>
                 <?= $this->url->link(t('Project settings'), 'project', 'show', array('project_id' => $task['project_id'])) ?>
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 68d63c58..713c2b3a 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -6,7 +6,10 @@
     'recurrence_basedate_list' => $this->task->recurrenceBasedates(),
 )) ?>
 
-<?= $this->render('task_modification/edit_time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
+<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $project['id'])): ?>
+    <?= $this->render('task_modification/edit_time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
+<?php endif ?>
+
 <?= $this->render('task/description', array('task' => $task)) ?>
 <?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'link_label_list' => $link_label_list)) ?>
 <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks, 'project' => $project, 'users_list' => isset($users_list) ? $users_list : array())) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index 9ee1e7df..d994aad3 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -21,6 +21,7 @@
 
         <?= $this->hook->render('template:task:sidebar:information') ?>
     </ul>
+    <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
     <h2><?= t('Actions') ?></h2>
     <ul>
         <li <?= $this->app->getRouterController() === 'taskmodification' && $this->app->getRouterAction() === 'edit' ? 'class="active"' : '' ?>>
@@ -71,6 +72,7 @@
 
         <?= $this->hook->render('template:task:sidebar:actions') ?>
     </ul>
+    <?php endif ?>
     <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>
     <div class="sidebar-expand" style="display: none"><a href="#" title="<?= t('Expand sidebar') ?>"><i class="fa fa-chevron-right"></i></a></div>
 </div>
-- 
cgit v1.2.3