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

Fix bad unique constraints in Mysql table user_has_notifications

This commit is contained in:
Frederic Guillot 2016-03-27 15:32:29 -04:00
parent 9ba44a01db
commit f11fccd0d7
6 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,7 @@ New features:
Improvements:
* Improve notification configuration form
* Handle state in OAuth2 client
* Allow to use the original template in overridden templates
* Unification of the project header
@ -30,6 +31,7 @@ Improvements:
Bug fixes:
* Fix bad unique constraints in Mysql table user_has_notifications
* Force integer type for aggregated metrics (Burndown chart concat values instead of summing)
* Fixes cycle time calculation when the start date is defined in the future
* Access allowed to any tasks from the shared public board by changing the URL parameters

19
app/Model/UserNotification.php
View File

@ -117,23 +117,20 @@ class UserNotification extends Base
*/
public function saveSettings($user_id, array $values)
{
$this->db->startTransaction();
$types = empty($values['notification_types']) ? array() : array_keys($values['notification_types']);
if (isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1) {
if (! empty($types)) {
$this->enableNotification($user_id);
$filter = empty($values['notifications_filter']) ? UserNotificationFilter::FILTER_BOTH : $values['notifications_filter'];
$projects = empty($values['notification_projects']) ? array() : array_keys($values['notification_projects']);
$types = empty($values['notification_types']) ? array() : array_keys($values['notification_types']);
$this->userNotificationFilter->saveFilter($user_id, $filter);
$this->userNotificationFilter->saveSelectedProjects($user_id, $projects);
$this->userNotificationType->saveSelectedTypes($user_id, $types);
} else {
$this->disableNotification($user_id);
}
$this->db->closeTransaction();
$filter = empty($values['notifications_filter']) ? UserNotificationFilter::FILTER_BOTH : $values['notifications_filter'];
$project_ids = empty($values['notification_projects']) ? array() : array_keys($values['notification_projects']);
$this->userNotificationFilter->saveFilter($user_id, $filter);
$this->userNotificationFilter->saveSelectedProjects($user_id, $project_ids);
$this->userNotificationType->saveSelectedTypes($user_id, $types);
}
/**

9
app/Model/UserNotificationFilter.php
View File

@ -61,10 +61,11 @@ class UserNotificationFilter extends Base
* @access public
* @param integer $user_id
* @param string $filter
* @return boolean
*/
public function saveFilter($user_id, $filter)
{
$this->db->table(User::TABLE)->eq('id', $user_id)->update(array(
return $this->db->table(User::TABLE)->eq('id', $user_id)->update(array(
'notifications_filter' => $filter,
));
}
@ -87,17 +88,21 @@ class UserNotificationFilter extends Base
* @access public
* @param integer $user_id
* @param integer[] $project_ids
* @return boolean
*/
public function saveSelectedProjects($user_id, array $project_ids)
{
$results = array();
$this->db->table(self::PROJECT_TABLE)->eq('user_id', $user_id)->remove();
foreach ($project_ids as $project_id) {
$this->db->table(self::PROJECT_TABLE)->insert(array(
$results[] = $this->db->table(self::PROJECT_TABLE)->insert(array(
'user_id' => $user_id,
'project_id' => $project_id,
));
}
return !in_array(false, $results, true);
}
/**

11
app/Schema/Mysql.php
View File

@ -6,7 +6,16 @@ use PDO;
use Kanboard\Core\Security\Token;
use Kanboard\Core\Security\Role;
const VERSION = 109;
const VERSION = 110;
function version_110(PDO $pdo)
{
$pdo->exec("ALTER TABLE user_has_notifications DROP FOREIGN KEY `user_has_notifications_ibfk_1`");
$pdo->exec("ALTER TABLE user_has_notifications DROP FOREIGN KEY `user_has_notifications_ibfk_2`");
$pdo->exec("DROP INDEX `project_id` ON user_has_notifications");
$pdo->exec("ALTER TABLE user_has_notifications DROP KEY `user_id`");
$pdo->exec("CREATE UNIQUE INDEX `user_has_notifications_unique_idx` ON `user_has_notifications` (`user_id`, `project_id`)");
}
function version_109(PDO $pdo)
{

3
app/Template/user/notifications.php
View File

@ -3,11 +3,8 @@
</div>
<form method="post" action="<?= $this->url->href('user', 'notifications', array('user_id' => $user['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), '1', $notifications['notifications_enabled'] == 1) ?><br>
<hr>
<h4><?= t('Notification methods:') ?></h4>
<?= $this->form->checkboxes('notification_types', $types, $notifications) ?>

5
tests/units/Model/UserNotificationFilterTest.php
View File

@ -26,10 +26,11 @@ class UserNotificationFilterTest extends Base
$this->assertEquals(1, $p->create(array('name' => 'UnitTest1')));
$this->assertEquals(2, $p->create(array('name' => 'UnitTest2')));
$this->assertEquals(3, $p->create(array('name' => 'UnitTest3')));
$this->assertEmpty($nf->getSelectedProjects(1));
$nf->saveSelectedProjects(1, array(1, 2));
$this->assertEquals(array(1, 2), $nf->getSelectedProjects(1));
$this->assertTrue($nf->saveSelectedProjects(1, array(1, 2, 3)));
$this->assertEquals(array(1, 2, 3), $nf->getSelectedProjects(1));
}
public function testSaveUserFilter()