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

Merge branch 'master' into 'master'

Browse Source 
Add handlebar helper to convert JSON to string

See merge request entgra/carbon-device-mgt!60
This commit is contained in:
Saad Sahibjan 2019-03-28 13:08:42 +00:00
commit 35071ed27b
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
View File

@ -223,6 +223,7 @@ policyModule = function () {
appObjectToView = {}; appObjectToView = {};
appObjectToView["appName"] = appObjectFromRestEndpoint["name"]; appObjectToView["appName"] = appObjectFromRestEndpoint["name"];
appObjectToView["appId"] = appObjectFromRestEndpoint["id"]; appObjectToView["appId"] = appObjectFromRestEndpoint["id"];
appObjectToView["webUrl"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
if ("webapp" === appObjectFromRestEndpoint["platform"]) { if ("webapp" === appObjectFromRestEndpoint["platform"]) {
appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["weburl"]; appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
appObjectToView["type"] = "Web Clip" appObjectToView["type"] = "Web Clip"

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
View File

@ -504,6 +504,12 @@ function formatRepoSelection(user) {
$(document).ready(function () { $(document).ready(function () {
// Handlebar helper to convert JSON to String
Handlebars.registerHelper("json", function (jsonObject) {
return JSON.stringify(jsonObject);
});
$("#users-input").select2({ $("#users-input").select2({
multiple: true, multiple: true,
tags: false, tags: false,

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
View File

@ -599,6 +599,12 @@ var formatRepoSelection = function (user) {
$(document).ready(function () { $(document).ready(function () {
// Handlebar helper to convert JSON to String
Handlebars.registerHelper("json", function (jsonObject) {
return JSON.stringify(jsonObject);
});
// Adding initial state of wizard-steps. // Adding initial state of wizard-steps.
$("#users-input").select2({ $("#users-input").select2({
multiple: true, multiple: true,
@ -755,5 +761,4 @@ $(document).ready(function () {
$("." + nextStep).removeClass("hidden"); $("." + nextStep).removeClass("hidden");
} }
}); });
}); });