summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-03-04 22:21:54 -0500
committerFrederic Guillot <fred@kanboard.net>2016-03-04 22:21:54 -0500
commit9b68c3bc77bfa49f820afbcb601aaf5174b39bcc (patch)
tree82d73a2f346ea14dc4220206302a97d97c3bec1d
parentf9f5d7188b71203558b97968081f72734df35e15 (diff)
Fix ambiguous column name with very old version of Sqlite
-rw-r--r--ChangeLog4
-rw-r--r--app/Controller/App.php3
-rw-r--r--app/Template/app/projects.php2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f8f154c..c90d6ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Security issues:
* Access allowed to any tasks from the shared public board by changing the URL parameters
+Bug fixes:
+
+* Ambiguous column name with very old version of Sqlite
+
Version 1.0.26
--------------
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): ?>