From 9b68c3bc77bfa49f820afbcb601aaf5174b39bcc Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 4 Mar 2016 22:21:54 -0500 Subject: Fix ambiguous column name with very old version of Sqlite --- app/Controller/App.php | 3 ++- app/Template/app/projects.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app') 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 @@ order('Id', 'id') ?> order('', 'is_private') ?> - order(t('Project'), 'name') ?> + order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?> getCollection() as $project): ?> -- cgit v1.2.3