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

Add default filter per user

Browse Source
This commit is contained in:
Aurélien
2018-04-02 23:07:04 +02:00
committed by Frédéric Guillot
parent bc4457c4cb
commit 5f7a3442d6
11 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/UserModificationController.php
View File

@@ -54,6 +54,7 @@ class UserModificationController extends BaseController
'email' => isset($values['email']) ? $values['email'] : '',
'timezone' => isset($values['timezone']) ? $values['timezone'] : '',
'language' => isset($values['language']) ? $values['language'] : '',
'filter' => isset($values['filter']) ? $values['filter'] : '',
);
}

2
app/Core/User/UserSession.php
View File

@@ -223,7 +223,7 @@ class UserSession extends Base
public function getFilters($projectID)
{
if (! session_exists('filters:'.$projectID)) {
return 'status:open';
return session_get('user')['filter'];
}
return session_get('filters:'.$projectID);

7
app/Schema/Mysql.php
View File

@@ -8,7 +8,12 @@ use PDO;
use Kanboard\Core\Security\Token;
use Kanboard\Core\Security\Role;
const VERSION = 127;
const VERSION = 128;
function version_128(PDO $pdo)
{
$pdo->exec('ALTER TABLE `users` ADD COLUMN `filter` VARCHAR(255) DEFAULT NULL');
}
function version_127(PDO $pdo)
{

7
app/Schema/Postgres.php
View File

@@ -8,7 +8,12 @@ use PDO;
use Kanboard\Core\Security\Token;
use Kanboard\Core\Security\Role;
const VERSION = 106;
const VERSION = 107;
function version_107(PDO $pdo)
{
$pdo->exec('ALTER TABLE "users" ADD COLUMN filter VARCHAR(255) DEFAULT NULL');
}
function version_106(PDO $pdo)
{

1
app/Schema/Sql/mysql.sql
View File

@@ -752,6 +752,7 @@ CREATE TABLE `users` (
`is_active` tinyint(1) DEFAULT '1',
`avatar_path` varchar(255) DEFAULT NULL,
`api_access_token` varchar(255) DEFAULT NULL,
`filter` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `users_username_idx` (`username`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

3
app/Schema/Sql/postgres.sql
View File

@@ -1299,7 +1299,8 @@ CREATE TABLE "users" (
"role" character varying(25) DEFAULT 'app-user'::character varying NOT NULL,
"is_active" boolean DEFAULT true,
"avatar_path" character varying(255),
"api_access_token" character varying(255) DEFAULT NULL::character varying
"api_access_token" character varying(255) DEFAULT NULL::character varying,
"filter" character varying(255) DEFAULT NULL::character varying
);

7
app/Schema/Sqlite.php
View File

@@ -8,7 +8,12 @@ use Kanboard\Core\Security\Token;
use Kanboard\Core\Security\Role;
use PDO;
const VERSION = 117;
const VERSION = 118;
function version_118(PDO $pdo)
{
$pdo->exec('ALTER TABLE users ADD COLUMN filter VARCHAR(255) DEFAULT NULL');
}
function version_117(PDO $pdo)
{

3
app/Template/user_creation/show.php
View File

@@ -50,6 +50,9 @@
<?= $this->form->label(t('Language'), 'language') ?>
<?= $this->form->select('language', $languages, $values, $errors) ?>
<?= $this->form->label(t('Filter'), 'filter') ?>
<?= $this->form->text('filter', $values, $errors) ?>
<?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
</fieldset>

3
app/Template/user_modification/show.php
View File

@@ -24,6 +24,9 @@
<?= $this->form->label(t('Language'), 'language') ?>
<?= $this->form->select('language', $languages, $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_language') ? '' : 'disabled')) ?>
<?= $this->form->label(t('Filter'), 'filter') ?>
<?= $this->form->text('filter', $values, $errors, array($this->user->hasAccess('UserModificationController', 'show/edit_filter') ? '' : 'readonly')) ?>
</fieldset>
<?php if ($this->user->isAdmin()): ?>

1
app/Template/user_view/show.php
View File

@@ -33,6 +33,7 @@
<ul class="panel">
<li><?= t('Timezone:') ?> <strong><?= $this->text->in($user['timezone'], $timezones) ?></strong></li>
<li><?= t('Language:') ?> <strong><?= $this->text->in($user['language'], $languages) ?></strong></li>
<li><?= t('Filter:') ?> <strong><?= $this->text->e($user['filter']) ?></strong></li>
<li><?= t('Notifications:') ?> <strong><?= $user['notifications_enabled'] == 1 ? t('Enabled') : t('Disabled') ?></strong></li>
</ul>