From 6bb924fa7b978f2a7ea7b832d4a537deb48bbe8c Mon Sep 17 00:00:00 2001 From: harshanl Date: Fri, 12 Aug 2016 13:53:32 +0530 Subject: [PATCH 1/2] Removed unnecessary mysql query from the mysl script --- .../src/main/resources/dbscripts/cdm/mysql.sql | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql index 39cfc6d1722..71de29d8338 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql @@ -587,8 +587,4 @@ DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND DM_DEVICE.ID = DM_DEVICE_DETAIL.DEVICE_ID ORDER BY TENANT_ID, DEVICE_ID; --- END OF DASHBOARD RELATED VIEWS -- - -SELECT feom.DEVICE_IDENTIFICATION, feom.DEVICE_TYPE, or.OPERATION_RESPONSE, feom.CREATED_TIMESTAMP -FROM DM_DEVICE_OPERATION_RESPONSE dor, (SELECT eom.OPERATION_ID, fe.DEVICE_IDENTIFICATION, fe.DEVICE_TYPE, fe.ENROLMENT_ID, eom.CREATED_TIMESTAMP, eom.UPDATED_TIMESTAMP, or.RECEIVED_TIMESTAMP FROM DM_ENROLMENT_OP_MAPPING eom, (SELECT e.ID AS ENROLMENT_ID, fd.DEVICE_ID, fd.DEVICE_IDENTIFICATION, fd.DEVICE_TYPE FROM DM_ENROLMENT e, (SELECT DISTINCT d.ID AS DEVICE_ID, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = -1234) fd WHERE e.DEVICE_ID = fd.DEVICE_ID AND e.TENANT_ID = -1234) fe WHERE eom.ENROLMENT_ID = fe.ENROLMENT_ID) feom WHERE or.OPERATION_ID = or.OPERATION_ID; - +-- END OF DASHBOARD RELATED VIEWS -- \ No newline at end of file From e5a4c0f7958ac5131bb3ab8ea5f5f192e92173f7 Mon Sep 17 00:00:00 2001 From: Ace Date: Mon, 15 Aug 2016 11:37:57 +0530 Subject: [PATCH 2/2] Adding role add/update/delete related changes --- .../units/cdmf.unit.role.create/create.hbs | 3 +- .../public/js/bottomJs.js | 24 +++++++----- .../permission.hbs | 14 +++++++ .../permission.js | 2 +- .../public/js/bottomJs.js | 31 ++++++++++------ .../app/units/cdmf.unit.role.edit/edit.hbs | 3 +- .../cdmf.unit.role.edit/public/js/bottomJs.js | 37 ++++++------------- .../public/js/role-listing.js | 6 +-- 8 files changed, 66 insertions(+), 54 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs index b74abb7dc4c..a93d3173a04 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs @@ -47,7 +47,7 @@ - +
@@ -81,6 +81,7 @@
+ diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js index f8c42854cfb..e038c32592b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js @@ -1,21 +1,3 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - /** * Checks if provided input is valid against RegEx input. * @@ -31,6 +13,8 @@ function inputIsValid(regExp, inputString) { var validateInline = {}; var clearInline = {}; +var apiBasePath = "/api/device-mgt/v1.0"; + var enableInlineError = function (inputField, errorMsg, errorSign) { var fieldIdentifier = "#" + inputField; var errorMsgIdentifier = "#" + inputField + " ." + errorMsg; @@ -113,12 +97,12 @@ function formatRepoSelection (user) { } $(document).ready(function () { - + var appContext = $("#app-context").data("app-context"); $("#users").select2({ multiple:true, tags: false, ajax: { - url: window.location.origin + "/devicemgt/api/invoker/execute/", + url: appContext + "/api/invoker/execute/", method: "POST", dataType: 'json', delay: 250, @@ -128,7 +112,7 @@ $(document).ready(function () { data: function (params) { var postData = {}; postData.actionMethod = "GET"; - postData.actionUrl = "/devicemgt_admin/users/view-users?username=" + params.term; + postData.actionUrl = apiBasePath + "/users/search/usernames?filter=" + params.term; postData.actionPayload = null; return JSON.stringify(postData); }, @@ -155,7 +139,7 @@ $(document).ready(function () { /** * Following click function would execute * when a user clicks on "Add Role" button - * on Add Role page in WSO2 Devicemgt Console. + * on Add Role page in WSO2 MDM Console. */ $("button#add-role-btn").click(function() { var rolenameInput = $("input#rolename"); @@ -183,12 +167,12 @@ $(document).ready(function () { addRoleFormData.roleName = domain + "/" + roleName; } - var addRoleAPI = "/devicemgt_admin/roles?rolename=" + encodeURIComponent(currentRoleName); + var addRoleAPI = apiBasePath + "/roles/" + currentRoleName; invokerUtil.put( addRoleAPI, addRoleFormData, - function (jqXHR) { - if (JSON.parse(jqXHR).status == 200 || jqXHR.status == 200) { + function (data, textStatus, jqXHR) { + if (jqXHR.status == 200) { // Clearing user input fields. $("input#rolename").val(""); $("#domain").val(""); @@ -197,7 +181,8 @@ $(document).ready(function () { $("#role-created-msg").removeClass("hidden"); } }, function (data) { - $(errorMsg).text(JSON.parse(data.responseText).errorMessage); + var payload = JSON.parse(data.responseText); + $(errorMsg).text(payload.message); $(errorMsgWrapper).removeClass("hidden"); } ); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js index 1b0991cb0a8..afeb0a393ec 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js @@ -16,7 +16,7 @@ * under the License. */ var loadRoleBasedActionURL = function (action, rolename) { - var href = $("#ast-container").data("app-context") + "roles/" + action + "?rolename=" + rolename; + var href = $("#ast-container").data("app-context") + "role/" + action + "/" + rolename; $(location).attr('href', href); }; @@ -113,13 +113,13 @@ function loadRoles(searchQuery) { class: "text-right content-fill text-left-on-grid-view no-wrap", data: null, render: function ( data, type, row, meta ) { - return '' + '' + '' + '' + '' + - '' + '' + '' +