Commit 7f42c480 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '932-error-during-assigning-user-s-role' into 'master'

Resolve "error during assigning user's role"

Closes #932

See merge request !926
parents d1c2ff8e 681fb6f4
Pipeline #13510 passed with stage
in 12 minutes and 49 seconds
minerva (14.0.0~beta.1) unstable; urgency=low
* Bug fix: problem with changing user role (#932)
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 3 Aug 2019 21:00:00 +0200
minerva (14.0.0~beta.0) unstable; urgency=low minerva (14.0.0~beta.0) unstable; urgency=low
* Small improvement: sorting by columns that doesn't make sense in admin * Small improvement: sorting by columns that doesn't make sense in admin
panel is disabled (#895) panel is disabled (#895)
......
...@@ -3581,9 +3581,9 @@ ...@@ -3581,9 +3581,9 @@
} }
}, },
"molart": { "molart": {
"version": "1.3.2", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/molart/-/molart-1.3.2.tgz", "resolved": "https://registry.npmjs.org/molart/-/molart-1.4.0.tgz",
"integrity": "sha512-NugAwv9loJFKmoWJWW1XwpR3u4qid9zkirdyXMYVoStxZgP7xfHLq+O+orL5867WaqpBfX5ZszUMOMbfpYn5Sg==", "integrity": "sha512-+HPcwFZTxa3BwBcyimgsg5pCSphy6hdidYUeQ8VcMOd8UhfdmdhZAsSQkF/E31jjlwnIuYTDqLAbKE8GsX5clA==",
"dev": true "dev": true
}, },
"mold-source-map": { "mold-source-map": {
......
...@@ -205,8 +205,7 @@ EditUserDialog.prototype.createGeneralTabContent = function () { ...@@ -205,8 +205,7 @@ EditUserDialog.prototype.createGeneralTabContent = function () {
$(result).on("click", "[name='user-role-" + self.getUser().getLogin() + "']", function () { $(result).on("click", "[name='user-role-" + self.getUser().getLogin() + "']", function () {
var field = this; var role = $('[name="user-role-' + self.getUser().getLogin() + '"]:checked', result).val();
var role = $('[name="user-role-' + self.getUser().getLogin() + '"]:checked', field).val();
var promises = []; var promises = [];
if (role === "ADMIN") { if (role === "ADMIN") {
promises.push(self.grantPrivilege({privilegeType: PrivilegeType.IS_ADMIN})); promises.push(self.grantPrivilege({privilegeType: PrivilegeType.IS_ADMIN}));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment