AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add project restriction for opening/closing tasks

Browse Source
This commit is contained in:
Frederic Guillot
2016-09-17 20:36:18 -04:00
parent 0e055eabe1
commit 4bc83646b0
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/ProjectRoleRestrictionModel.php
View File

@@ -13,11 +13,16 @@ use Kanboard\Core\Base;
class ProjectRoleRestrictionModel extends Base class ProjectRoleRestrictionModel extends Base
{ {
const TABLE = 'project_role_has_restrictions'; const TABLE = 'project_role_has_restrictions';
const RULE_TASK_CREATION = 'task_creation';
const RULE_TASK_CREATION = 'task_creation';
const RULE_TASK_OPEN_CLOSE = 'task_open_close';
protected $ruleMapping = array( protected $ruleMapping = array(
self::RULE_TASK_CREATION => array( self::RULE_TASK_CREATION => array(
array('controller' => 'TaskCreationController', 'method' => '*'), array('controller' => 'TaskCreationController', 'method' => '*'),
),
self::RULE_TASK_OPEN_CLOSE => array(
array('controller' => 'TaskStatusController', 'method' => '*'),
) )
); );
@@ -29,7 +34,8 @@ class ProjectRoleRestrictionModel extends Base
public function getRules() public function getRules()
{ {
return array( return array(
self::RULE_TASK_CREATION => t('Task creation is not permitted'), self::RULE_TASK_CREATION => t('Task creation is not permitted'),
self::RULE_TASK_OPEN_CLOSE => t('Closing or opening a task is not permitted'),
); );
} }

2
app/Template/task/dropdown.php
View File

@@ -49,7 +49,7 @@
<?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li> </li>
<?php endif ?> <?php endif ?>
<?php if (isset($task['is_active'])): ?> <?php if (isset($task['is_active']) && $this->user->hasProjectAccess('TaskStatusController', 'close', $task['project_id'])): ?>
<li> <li>
<?php if ($task['is_active'] == 1): ?> <?php if ($task['is_active'] == 1): ?>
<i class="fa fa-times fa-fw"></i> <i class="fa fa-times fa-fw"></i>

30
app/Template/task/sidebar.php
View File

@@ -78,20 +78,22 @@
<i class="fa fa-clone fa-fw"></i> <i class="fa fa-clone fa-fw"></i>
<?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li> </li>
<?php if ($task['is_active'] == 1): ?> <?php if ($this->user->hasProjectAccess('TaskStatusController', 'close', $task['project_id'])): ?>
<li> <?php if ($task['is_active'] == 1): ?>
<i class="fa fa-arrows fa-fw"></i> <li>
<?= $this->url->link(t('Move position'), 'TaskMovePositionController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <i class="fa fa-arrows fa-fw"></i>
</li> <?= $this->url->link(t('Move position'), 'TaskMovePositionController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
<li> </li>
<i class="fa fa-times fa-fw"></i> <li>
<?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <i class="fa fa-times fa-fw"></i>
</li> <?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
<?php else: ?> </li>
<li> <?php else: ?>
<i class="fa fa-check-square-o fa-fw"></i> <li>
<?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <i class="fa fa-check-square-o fa-fw"></i>
</li> <?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li>
<?php endif ?>
<?php endif ?> <?php endif ?>
<?php if ($this->projectRole->canRemoveTask($task)): ?> <?php if ($this->projectRole->canRemoveTask($task)): ?>
<li> <li>