Allow project managers to remove tasks

This commit is contained in:
Frédéric Guillot
2015-01-02 22:14:28 -05:00
parent 0ebdd4ddfd
commit 5c6b67bd76
7 changed files with 6 additions and 11 deletions

View File

@@ -52,7 +52,6 @@ class Acl extends Base
'category' => '*',
'project' => array('edit', 'update', 'exporttasks', 'exportdailyprojectsummary', 'share', 'integration', 'users', 'alloweverybody', 'allow', 'setowner', 'revoke', 'duplicate', 'disable', 'enable'),
'swimlane' => '*',
'task' => array('remove'),
);
/**

View File

@@ -198,7 +198,7 @@ class ProjectPermission extends Base
->table(self::TABLE)
->eq('project_id', $project_id)
->eq('user_id', $user_id)
->update(array('is_owner' => $is_owner));
->update(array('is_owner' => (int) $is_owner));
}
/**

View File

@@ -20,7 +20,7 @@ class TaskPermission extends Base
*/
public function canRemoveTask(array $task)
{
if ($this->userSession->isAdmin()) {
if ($this->userSession->isAdmin() || $this->projectPermission->isManager($task['project_id'], $this->userSession->getId())) {
return true;
}
else if (isset($task['creator_id']) && $task['creator_id'] == $this->userSession->getId()) {