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

Fix PHP error in pull-request

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-16 22:13:23 -05:00
parent 697e661ef5
commit 12380b69d4
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/Comment.php
View File

@@ -55,17 +55,17 @@ class Comment extends Base
'values' => $values, 'values' => $values,
'errors' => $errors, 'errors' => $errors,
'task' => $task, 'task' => $task,
'ajax' => $ajax 'ajax' => $ajax,
))); )));
} else { }
$this->response->html($this->taskLayout('comment/create', array( $this->response->html($this->taskLayout('comment/create', array(
'values' => $values, 'values' => $values,
'errors' => $errors, 'errors' => $errors,
'task' => $task, 'task' => $task,
'title' => t('Add a comment') 'title' => t('Add a comment'),
))); )));
} }
}
/** /**
* Add a comment * Add a comment
@@ -92,10 +92,9 @@ class Comment extends Base
if ($ajax) { if ($ajax) {
$this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']); $this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
} }
else {
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments'); $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments');
} }
}
$this->create($values, $errors); $this->create($values, $errors);
} }

4
app/Template/comment/create.php
View File

@@ -2,7 +2,7 @@
<h2><?= t('Add a comment') ?></h2> <h2><?= t('Add a comment') ?></h2>
</div> </div>
<form method="post" action="<?= $this->u('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => $ajax)) ?>" autocomplete="off"> <form method="post" action="<?= $this->u('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => isset($ajax))) ?>" autocomplete="off">
<?= $this->formCsrf() ?> <?= $this->formCsrf() ?>
<?= $this->formHidden('task_id', $values) ?> <?= $this->formHidden('task_id', $values) ?>
<?= $this->formHidden('user_id', $values) ?> <?= $this->formHidden('user_id', $values) ?>
@@ -30,7 +30,7 @@
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?php if (! isset($skip_cancel)): ?> <?php if (! isset($skip_cancel)): ?>
<?= t('or') ?> <?= t('or') ?>
<?php if ($ajax): ?> <?php if (isset($ajax)): ?>
<?= $this->a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?> <?= $this->a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
<?php else: ?> <?php else: ?>
<?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>