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

Avoid to disable the default swimlane during renaming when there is no other activated swimlane

This commit is contained in:
Frederic Guillot 2015-10-23 20:48:02 -04:00
parent ffeffa54f9
commit 9aca556fc6
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@ Improvements:
Bug fixes:
* People should not see any tasks during a search when they are not associated to a project
* Avoid to disable the default swimlane during renaming when there is no other activated swimlane
Version 1.0.19
--------------

2
app/Template/board/table_container.php
View File

@ -1,6 +1,6 @@
<div id="board-container">
<?php if (empty($swimlanes) || empty($swimlanes[0]['nb_columns'])): ?>
<p class="alert alert-error"><?= t('There is no column in your project!') ?></p>
<p class="alert alert-error"><?= t('There is no column or swimlane activated in your project!') ?></p>
<?php else: ?>
<?php if (isset($not_editable)): ?>

56
app/Template/swimlane/index.php
View File

@ -1,3 +1,25 @@
<div class="page-header">
<h2><?= t('Change default swimlane') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('swimlane', 'change', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $default_swimlane) ?>
<?= $this->form->label(t('Rename'), 'default_swimlane') ?>
<?= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?><br/>
<?php if (! empty($active_swimlanes) || $default_swimlane['show_default_swimlane'] == 0): ?>
<?= $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, $default_swimlane['show_default_swimlane'] == 1) ?>
<?php else: ?>
<?= $this->form->hidden('show_default_swimlane', $default_swimlane) ?>
<?php endif ?>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>
</form>
<?php if (! empty($active_swimlanes)): ?>
<div class="page-header">
<h2><?= t('Active swimlanes') ?></h2>
@ -5,6 +27,13 @@
<?= $this->render('swimlane/table', array('swimlanes' => $active_swimlanes, 'project' => $project)) ?>
<?php endif ?>
<?php if (! empty($inactive_swimlanes)): ?>
<div class="page-header">
<h2><?= t('Inactive swimlanes') ?></h2>
</div>
<?= $this->render('swimlane/table', array('swimlanes' => $inactive_swimlanes, 'project' => $project, 'hide_position' => true)) ?>
<?php endif ?>
<div class="page-header">
<h2><?= t('Add a new swimlane') ?></h2>
</div>
@ -40,30 +69,3 @@
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>
</form>
<div class="page-header">
<h2><?= t('Change default swimlane') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('swimlane', 'change', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $default_swimlane) ?>
<?= $this->form->label(t('Rename'), 'default_swimlane') ?>
<?= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?><br/>
<?php if (! empty($active_swimlanes)): ?>
<?= $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, isset($default_swimlane['show_default_swimlane']) && $default_swimlane['show_default_swimlane'] == 1) ?>
<?php endif ?>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>
</form>
<?php if (! empty($inactive_swimlanes)): ?>
<div class="page-header">
<h2><?= t('Inactive swimlanes') ?></h2>
</div>
<?= $this->render('swimlane/table', array('swimlanes' => $inactive_swimlanes, 'project' => $project, 'hide_position' => true)) ?>
<?php endif ?>