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

Various fixes and improvements

Browse Source
This commit is contained in:
Frédéric Guillot
2015-01-02 21:11:19 -05:00
parent 3076ba22dd
commit 45c95d74fc
15 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Template/comment/show.php
View File

@@ -39,7 +39,7 @@
'controller' => 'task',
'action' => 'show',
'params' => array(
'project_id' => $project['id']
'project_id' => $task['project_id']
)
)
) ?>

2
app/Template/project/sidebar.php
View File

@@ -24,7 +24,7 @@
<li>
<?= $this->a(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
</li>
<?php if ($project['is_private'] == 0): ?>
<?php if ($this->userSession->isAdmin() || $project['is_private'] == 0): ?>
<li>
<?= $this->a(t('User management'), 'project', 'users', array('project_id' => $project['id'])) ?>
</li>

6
app/Template/project/users.php
View File

@@ -13,12 +13,15 @@
<tr>
<th><?= t('User') ?></th>
<th><?= t('Role for this project') ?></th>
<th><?= t('Actions') ?></th>
<?php if ($project['is_private'] == 0): ?>
<th><?= t('Actions') ?></th>
<?php endif ?>
</tr>
<?php foreach ($users['allowed'] as $user_id => $username): ?>
<tr>
<td><?= $this->e($username) ?></td>
<td><?= isset($users['managers'][$user_id]) ? t('Project manager') : t('Project member') ?></td>
<?php if ($project['is_private'] == 0): ?>
<td>
<ul>
<li><?= $this->a(t('Revoke'), 'project', 'revoke', array('project_id' => $project['id'], 'user_id' => $user_id), true) ?></li>
@@ -31,6 +34,7 @@
</li>
</ul>
</td>
<?php endif ?>
</tr>
<?php endforeach ?>
</table>

2
app/Template/subtask/remove.php
View File

@@ -10,7 +10,7 @@
<p><strong><?= $this->e($subtask['title']) ?></strong></p>
<div class="form-actions">
<?= $this->a(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
<?= $this->a(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</div>

4
app/Template/subtask/show.php
View File

@@ -44,10 +44,10 @@
<td>
<ul>
<li>
<?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
<?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
</li>
<li>
<?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
<?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
</li>
</ul>
</td>