diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-03-04 22:21:54 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-03-04 22:21:54 -0500 |
| commit | 9b68c3bc77bfa49f820afbcb601aaf5174b39bcc (patch) | |
| tree | 82d73a2f346ea14dc4220206302a97d97c3bec1d /app | |
| parent | f9f5d7188b71203558b97968081f72734df35e15 (diff) | |
Fix ambiguous column name with very old version of Sqlite
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/App.php | 3 | ||||
| -rw-r--r-- | app/Template/app/projects.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controller/App.php b/app/Controller/App.php index b816764d..df1d3c90 100644 --- a/app/Controller/App.php +++ b/app/Controller/App.php @@ -2,6 +2,7 @@ namespace Kanboard\Controller; +use Kanboard\Model\Project as ProjectModel; use Kanboard\Model\Subtask as SubtaskModel; /** @@ -26,7 +27,7 @@ class App extends Base return $this->paginator ->setUrl('app', $action, array('pagination' => 'projects', 'user_id' => $user_id)) ->setMax($max) - ->setOrder('name') + ->setOrder(ProjectModel::TABLE.'.name') ->setQuery($this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id))) ->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects'); } diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php index 668b87c3..4ab8b106 100644 --- a/app/Template/app/projects.php +++ b/app/Template/app/projects.php @@ -8,7 +8,7 @@ <tr> <th class="column-5"><?= $paginator->order('Id', 'id') ?></th> <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th> - <th class="column-25"><?= $paginator->order(t('Project'), 'name') ?></th> + <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?></th> <th><?= t('Columns') ?></th> </tr> <?php foreach ($paginator->getCollection() as $project): ?> |