Skip to content
Snippets Groups Projects
Commit 7dbb44ae authored by Piotr Gawron's avatar Piotr Gawron
Browse files

user wasn't updated completly via update command

parent 4df9341c
No related branches found
No related tags found
2 merge requests!541version 12.1.3 into master,!523Resolve "LDAP connector problem with case insensitive logins"
......@@ -351,6 +351,10 @@ User.prototype.update = function (user) {
self.setMinColor(user.getMinColor());
self.setMaxColor(user.getMaxColor());
self.setSimpleColor(user.getSimpleColor());
self.setNeutralColor(user.getNeutralColor());
self.setTermsOfUseConsent(user.isTermsOfUseConsent());
self.setLdapAccountAvailable(user.isLdapAccountAvailable());
self.setConnectedToLdap(user.isConnectedToLdap());
return self.callListeners("onreload");
};
......@@ -376,7 +380,9 @@ User.prototype.isTermsOfUseConsent = function () {
* @param {boolean} ldapAccountAvailable
*/
User.prototype.setLdapAccountAvailable = function (ldapAccountAvailable) {
this._ldapAccountAvailable = ldapAccountAvailable;
if (ldapAccountAvailable !== undefined) {
this._ldapAccountAvailable = ldapAccountAvailable;
}
};
/**
......@@ -392,7 +398,9 @@ User.prototype.isLdapAccountAvailable = function () {
* @param {boolean} connectedToLdap
*/
User.prototype.setConnectedToLdap = function (connectedToLdap) {
this._connectedToLdap = connectedToLdap;
if (connectedToLdap !== undefined) {
this._connectedToLdap = connectedToLdap;
}
};
/**
......
......@@ -10,7 +10,7 @@ var logger = require('../../logger');
var chai = require('chai');
var assert = chai.assert;
describe('Project', function () {
describe('User', function () {
describe("constructor", function () {
it("empty data", function () {
var user = new User({});
......@@ -20,6 +20,17 @@ describe('Project', function () {
});
});
describe("update", function () {
it("ldap account available", function () {
var user = new User({});
assert.ok(user);
var user2 = new User({ldapAccountAvailable:true});
user.update(user2);
assert.ok(user.isLdapAccountAvailable());
});
});
describe("setPrivilege", function () {
it("non existing data", function () {
var user = new User({});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment