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

Fix issue when unlinking Gitlab account

Browse Source
This commit is contained in:
Frederic Guillot
2015-10-03 18:22:06 -04:00
parent 260c8515c5
commit c9e3178720
4 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Model/Base.php
View File

@@ -96,6 +96,22 @@ abstract class Base extends \Core\Base
}
}
/**
* Force some fields to be null if empty
*
* @access public
* @param array $values Input array
* @param string[] $keys List of keys
*/
public function convertNullFields(array &$values, array $keys)
{
foreach ($keys as $key) {
if (array_key_exists($key, $values) && empty($values[$key])) {
$values[$key] = null;
}
}
}
/**
* Build SQL condition for a given time range
*

2
app/Model/User.php
View File

@@ -279,7 +279,7 @@ class User extends Base
$this->removeFields($values, array('confirmation', 'current_password'));
$this->resetFields($values, array('is_admin', 'is_ldap_user', 'is_project_admin', 'disable_login_form'));
$this->removeEmptyFields($values, array('gitlab_id'));
$this->convertNullFields($values, array('gitlab_id'));
$this->convertIntegerFields($values, array('gitlab_id'));
}