community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for EMM-1559

Browse Source
This commit is contained in:
kamidu 2016-09-14 16:23:21 +05:30
parent 1d7546916c
commit e2d0f7d040
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/public/js/bottomJs.js
View File

@ -99,12 +99,9 @@ function formatRepo (user) {
var markup = '<div class="clearfix">' + var markup = '<div class="clearfix">' +
'<div class="col-sm-8">' + '<div class="col-sm-8">' +
'<div class="clearfix">' + '<div class="clearfix">' +
'<div class="col-sm-3">User : ' + user.username + '</div>'; '<div class="col-sm-4">' + user.username + '</div>';
if (user.name) { if (user.name || user.name != undefined) {
markup += '<div class="col-sm-3"> ' + user.name + '</div>'; markup += '<div class="col-sm-8"> ( ' + user.name + ' )</div>';
}
if (user.emailAddress) {
markup += '<div class="col-sm-3"> ' + user.emailAddress + '</div>';
} }
markup += '</div></div></div>'; markup += '</div></div></div>';
return markup; return markup;
@ -140,8 +137,9 @@ $(document).ready(function () {
var user = {}; var user = {};
user.id = value.username; user.id = value.username;
user.username = value.username; user.username = value.username;
user.name = value.firstname + " " + value.lastname; if(value.firstname && value.lastname) {
user.emailAddress = value.emailAddress; user.name = value.firstname + " " + value.lastname;
}
newData.push(user); newData.push(user);
}); });
return { return {

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
View File

@ -234,13 +234,8 @@ $(document).ready(function () {
addUserAPI, addUserAPI,
addUserFormData, addUserFormData,
function (data, textStatus, jqXHR) { function (data, textStatus, jqXHR) {
if (jqXHR.status == 201) { if (jqXHR.status == 200) {
// Clearing user input fields. // Clearing user input fields.
$("input#username").val("");
$("input#firstname").val("");
$("input#lastname").val("");
$("input#email").val("");
$("select#roles").select2("val", "");
// Refreshing with success message // Refreshing with success message
$("#user-create-form").addClass("hidden"); $("#user-create-form").addClass("hidden");
$("#user-created-msg").removeClass("hidden"); $("#user-created-msg").removeClass("hidden");