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

Fix ambiguous column name with very old version of Sqlite

Browse Source
This commit is contained in:
Frederic Guillot
2016-03-04 22:21:54 -05:00
parent f9f5d7188b
commit 9b68c3bc77
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -9,6 +9,10 @@ Security issues:
* Access allowed to any tasks from the shared public board by changing the URL parameters * 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 Version 1.0.26
-------------- --------------

3
app/Controller/App.php
View File

@@ -2,6 +2,7 @@
namespace Kanboard\Controller; namespace Kanboard\Controller;
use Kanboard\Model\Project as ProjectModel;
use Kanboard\Model\Subtask as SubtaskModel; use Kanboard\Model\Subtask as SubtaskModel;
/** /**
@@ -26,7 +27,7 @@ class App extends Base
return $this->paginator return $this->paginator
->setUrl('app', $action, array('pagination' => 'projects', 'user_id' => $user_id)) ->setUrl('app', $action, array('pagination' => 'projects', 'user_id' => $user_id))
->setMax($max) ->setMax($max)
->setOrder('name') ->setOrder(ProjectModel::TABLE.'.name')
->setQuery($this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id))) ->setQuery($this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id)))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects'); ->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects');
} }

2
app/Template/app/projects.php
View File

@@ -8,7 +8,7 @@
<tr> <tr>
<th class="column-5"><?= $paginator->order('Id', 'id') ?></th> <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-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> <th><?= t('Columns') ?></th>
</tr> </tr>
<?php foreach ($paginator->getCollection() as $project): ?> <?php foreach ($paginator->getCollection() as $project): ?>