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

Enforce restrictions for column menus

Browse Source
This commit is contained in:
Frederic Guillot
2016-09-18 22:05:20 -04:00
parent 3043163747
commit c328bcf840
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/TaskBulkController.php
View File

@@ -47,7 +47,12 @@ class TaskBulkController extends BaseController
$values = $this->request->getValues(); $values = $this->request->getValues();
list($valid, $errors) = $this->taskValidator->validateBulkCreation($values); list($valid, $errors) = $this->taskValidator->validateBulkCreation($values);
if ($valid) { if (! $valid) {
$this->show($values, $errors);
} else if (! $this->helper->projectRole->canCreateTaskInColumn($project['id'], $values['column_id'])) {
$this->flash->failure(t('You cannot create tasks in this column.'));
$this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])), true);
} else {
$this->createTasks($project, $values); $this->createTasks($project, $values);
$this->response->redirect($this->helper->url->to( $this->response->redirect($this->helper->url->to(
'BoardViewController', 'BoardViewController',
@@ -55,8 +60,6 @@ class TaskBulkController extends BaseController
array('project_id' => $project['id']), array('project_id' => $project['id']),
'swimlane-'. $values['swimlane_id'] 'swimlane-'. $values['swimlane_id']
), true); ), true);
} else {
$this->show($values, $errors);
} }
} }

16
app/Template/board/table_column.php
View File

@@ -35,18 +35,20 @@
<i class="fa fa-minus-square fa-fw"></i> <i class="fa fa-minus-square fa-fw"></i>
<a href="#" class="board-toggle-column-view" data-column-id="<?= $column['id'] ?>"><?= t('Hide this column') ?></a> <a href="#" class="board-toggle-column-view" data-column-id="<?= $column['id'] ?>"><?= t('Hide this column') ?></a>
</li> </li>
<?php if ($this->user->hasProjectAccess('TaskCreationController', 'show', $column['project_id'])): ?> <?php if ($this->projectRole->canCreateTaskInColumn($column['project_id'], $column['id'])): ?>
<li> <li>
<i class="fa fa-align-justify fa-fw" aria-hidden="true"></i> <i class="fa fa-align-justify fa-fw" aria-hidden="true"></i>
<?= $this->url->link(t('Create tasks in bulk'), 'TaskBulkController', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> <?= $this->url->link(t('Create tasks in bulk'), 'TaskBulkController', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
</li> </li>
<?php if ($column['nb_tasks'] > 0): ?>
<li>
<i class="fa fa-close fa-fw"></i>
<?= $this->url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
</li>
<?php endif ?>
<?php endif ?> <?php endif ?>
<?php if ($column['nb_tasks'] > 0 && $this->projectRole->canChangeTaskStatusInColumn($column['project_id'], $column['id'])): ?>
<li>
<i class="fa fa-close fa-fw"></i>
<?= $this->url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
</li>
<?php endif ?>
<?= $this->hook->render('template:board:column:dropdown', array('swimlane' => $swimlane, 'column' => $column)) ?> <?= $this->hook->render('template:board:column:dropdown', array('swimlane' => $swimlane, 'column' => $column)) ?>
</ul> </ul>
</span> </span>