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

EditProjectDialog and EditUserDialog manages tabs via guiUtils

parent aed2dcec
No related branches found
No related tags found
1 merge request!369Resolve "Functionality to update Terms of Service"
...@@ -301,6 +301,10 @@ Configuration.prototype.setPrivilegeTypes = function (privilegeTypes) { ...@@ -301,6 +301,10 @@ Configuration.prototype.setPrivilegeTypes = function (privilegeTypes) {
} }
}; };
/**
*
* @returns {PrivilegeType[]}
*/
Configuration.prototype.getPrivilegeTypes = function () { Configuration.prototype.getPrivilegeTypes = function () {
return this._privilegeTypes; return this._privilegeTypes;
}; };
......
...@@ -72,7 +72,6 @@ EditProjectDialog.prototype.createGui = function () { ...@@ -72,7 +72,6 @@ EditProjectDialog.prototype.createGui = function () {
name: "COMMENTS", name: "COMMENTS",
panelClass: CommentsTab panelClass: CommentsTab
}); });
// var element = Functions.createElement({type: "div", style: "margin-top:10px;"});
self.setCommentsTab(self._panels[0]); self.setCommentsTab(self._panels[0]);
$(".nav-tabs > li > a", self.getElement()).bind("click", function () { $(".nav-tabs > li > a", self.getElement()).bind("click", function () {
......
This diff is collapsed.
...@@ -171,7 +171,7 @@ UsersAdminPanel.prototype._createUsersTableRow = function () { ...@@ -171,7 +171,7 @@ UsersAdminPanel.prototype._createUsersTableRow = function () {
} }
}).catch(function (error) { }).catch(function (error) {
GuiConnector.alert(error); GuiConnector.alert(error);
}).finally(function(){ }).finally(function () {
GuiConnector.hideProcessing(); GuiConnector.hideProcessing();
}); });
}); });
...@@ -220,7 +220,8 @@ UsersAdminPanel.prototype.getDialog = function (user) { ...@@ -220,7 +220,8 @@ UsersAdminPanel.prototype.getDialog = function (user) {
type: "div" type: "div"
}), }),
user: user, user: user,
customMap: null configuration: self.getConfiguration(),
serverConnector: self.getServerConnector()
}); });
self._dialogs[user.getLogin()] = dialog; self._dialogs[user.getLogin()] = dialog;
if (user.getLogin() === undefined) { if (user.getLogin() === undefined) {
......
...@@ -251,7 +251,7 @@ User.prototype.hasPrivilege = function (type, objectId) { ...@@ -251,7 +251,7 @@ User.prototype.hasPrivilege = function (type, objectId) {
/** /**
* *
* @param {Object} params * @param {Object} params
* @param {number} params.objectId * @param {number} [params.objectId]
* @param {PrivilegeType} params.type * @param {PrivilegeType} params.type
* @param {number} [params.value=1] * @param {number} [params.value=1]
*/ */
......
...@@ -13,6 +13,16 @@ var chai = require('chai'); ...@@ -13,6 +13,16 @@ var chai = require('chai');
var assert = chai.assert; var assert = chai.assert;
var expect = chai.expect; var expect = chai.expect;
function createEditUserDialog(project, user) {
return new EditUserDialog({
element: testDiv,
project: project,
user: user,
configuration: helper.getConfiguration(),
serverConnector: ServerConnector
});
}
describe('EditUserDialog', function () { describe('EditUserDialog', function () {
describe('init', function () { describe('init', function () {
...@@ -22,12 +32,7 @@ describe('EditUserDialog', function () { ...@@ -22,12 +32,7 @@ describe('EditUserDialog', function () {
var user = new User({}); var user = new User({});
return ServerConnector.getProject().then(function (result) { return ServerConnector.getProject().then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
assert.equal(0, logger.getWarnings().length); assert.equal(0, logger.getWarnings().length);
...@@ -45,12 +50,7 @@ describe('EditUserDialog', function () { ...@@ -45,12 +50,7 @@ describe('EditUserDialog', function () {
var user = new User({}); var user = new User({});
return ServerConnector.getProject().then(function (result) { return ServerConnector.getProject().then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
return dialog.checkValidity().then(function () { return dialog.checkValidity().then(function () {
...@@ -72,12 +72,7 @@ describe('EditUserDialog', function () { ...@@ -72,12 +72,7 @@ describe('EditUserDialog', function () {
return ServerConnector.getProject(); return ServerConnector.getProject();
}).then(function (result) { }).then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
return dialog.checkValidity(); return dialog.checkValidity();
...@@ -99,12 +94,7 @@ describe('EditUserDialog', function () { ...@@ -99,12 +94,7 @@ describe('EditUserDialog', function () {
return ServerConnector.getProject(); return ServerConnector.getProject();
}).then(function (result) { }).then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
return dialog.onSaveClicked(); return dialog.onSaveClicked();
...@@ -127,12 +117,7 @@ describe('EditUserDialog', function () { ...@@ -127,12 +117,7 @@ describe('EditUserDialog', function () {
return ServerConnector.getProject(); return ServerConnector.getProject();
}).then(function (result) { }).then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
return $("[name=privilege-checkbox]", dialog.getElement()).click(); return $("[name=privilege-checkbox]", dialog.getElement()).click();
...@@ -156,12 +141,7 @@ describe('EditUserDialog', function () { ...@@ -156,12 +141,7 @@ describe('EditUserDialog', function () {
return ServerConnector.getProject(); return ServerConnector.getProject();
}).then(function (result) { }).then(function (result) {
project = result; project = result;
dialog = new EditUserDialog({ dialog = createEditUserDialog(project, user);
element: testDiv,
project: project,
user: user,
customMap: null
});
return dialog.init(); return dialog.init();
}).then(function () { }).then(function () {
$("[name=privilege-int]", dialog.getElement()).val("101010"); $("[name=privilege-int]", dialog.getElement()).val("101010");
......
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