community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl

Browse Source
This commit is contained in:
mharindu 2016-07-22 16:50:37 +05:30
commit d2f02d128c
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
View File

@ -1,14 +1,14 @@
{ {
"appContext": "/emm/", "appContext": "/emm/",
"clientName": "emm", "clientName": "emm",
"webAgentContext" : "/devicemgt-web-agent/", "webAgentContext" : "/emm-web-agent/",
"apiContext": "api", "apiContext": "api",
"httpsURL" : "https://localhost:9443", "httpsURL" : "%https.ip%",
"httpURL" : "%http.ip%", "httpURL" : "%http.ip%",
"httpsWebURL" : "%https.ip%", "httpsWebURL" : "%https.ip%",
"wssURL" : "%https.ip%", "wssURL" : "%https.ip%",
"wsURL" : "%http.ip%", "wsURL" : "%http.ip%",
"dashboardserverURL" : "%https.ip%", "dashboardServerURL" : "%https.ip%",
"enrollmentDir": "/emm-web-agent/enrollment", "enrollmentDir": "/emm-web-agent/enrollment",
"iOSConfigRoot" : "%https.ip%/ios-enrollment/", "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
"iOSAPIRoot" : "%https.ip%/ios/", "iOSAPIRoot" : "%https.ip%/ios/",
@ -19,6 +19,7 @@
"adminUser":"admin@carbon.super", "adminUser":"admin@carbon.super",
"adminRole":"admin", "adminRole":"admin",
"usernameLength":30, "usernameLength":30,
"pageSize":10,
"ssoConfiguration" : { "ssoConfiguration" : {
"enabled" : false, "enabled" : false,
"issuer" : "devicemgt", "issuer" : "devicemgt",
@ -46,9 +47,9 @@
"groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces." "groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces."
}, },
"roleValidationConfig" : { "roleValidationConfig" : {
"rolenameJSRegEx" : "^[\\S]{3,30}$", "roleNameJSRegEx" : "^[\\S]{3,30}$",
"rolenameRegExViolationErrorMsg" : "Provided role name is invalid.", "roleNameRegExViolationErrorMsg" : "Provided role name is invalid.",
"rolenameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces." "roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces."
}, },
"generalConfig" : { "generalConfig" : {
"host" : "https://localhost:9443", "host" : "https://localhost:9443",
@ -64,9 +65,11 @@
"device-modify", "device-search", "operation-install", "operation-view", "operation-modify", "operation-uninstall", "device-modify", "device-search", "operation-install", "operation-view", "operation-modify", "operation-uninstall",
"group-add", "group-share", "group-modify", "group-view", "group-remove", "certificate-modify", "certificate-view", "group-add", "group-share", "group-modify", "group-view", "group-remove", "certificate-modify", "certificate-view",
"configuration-view", "configuration-modify", "policy-view", "policy-modify", "device-notification-view", "configuration-view", "configuration-modify", "policy-view", "policy-modify", "device-notification-view",
"device-notification-modify", "feature-view", "arduino_device", "arduino_user", " android_sense_user", "device-notification-modify", "feature-view", "roles-view", "roles-modify", "roles-remove", "roles-add",
"virtual_firealarm_user", "raspberrypi_user", "roles-view", "roles-modify", "roles-remove", "roles-add",
"user-password-reset", "user-password-modify", "user-modify", "user-view", "user-invite", "user-remove", "user-add" "user-password-reset", "user-password-modify", "user-modify", "user-view", "user-invite", "user-remove", "user-add"
], ],
"isOAuthEnabled" : true "isOAuthEnabled" : true,
"backendRestEndpoints" : {
"deviceMgt" : "/api/device-mgt/v1.0"
}
} }

1
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js
View File

@ -17,7 +17,6 @@
*/ */
var updateStats = function (serviceURL, id) { var updateStats = function (serviceURL, id) {
console.log(serviceURL);
invokerUtil.get( invokerUtil.get(
serviceURL, serviceURL,
function (data, textStatus, jqXHR) { function (data, textStatus, jqXHR) {