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 platform config listing

Browse Source
This commit is contained in:
charitha 2019-09-17 20:02:50 +05:30
parent 705f6fbbe4
commit 30d4a5707a
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.dynamic.platform.configuration/configuration.hbs
View File

@ -32,10 +32,3 @@
</div>
</div>
</div>
{{#zone "bottomJs"}}
<script type="text/javascript">
$(document).ready(function () {
loadDynamicDeviceTypeConfig('{{@unit.params.deviceType}}');
});
</script>
{{/zone}}

9
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
View File

@ -193,4 +193,13 @@
{{/zone}}
{{#zone "bottomJs"}}
{{js "js/platform-configuration.js"}}
<script type="text/javascript">
$(document).ready(function () {
{{#each deviceTypes}}
{{#unless unitName}}
loadDynamicDeviceTypeConfig('{{name}}');
{{/unless}}
{{/each}}
});
</script>
{{/zone}}

28
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js
View File

@ -163,7 +163,7 @@ var loadDynamicDeviceTypeConfig = function (deviceType) {
configAPI,
function (data) {
data = JSON.parse(data);
var fieldWrapper = "#" + deviceType + "-config-field-wrapper";
var fieldWrapper = "#" + escapeSelector(deviceType + "-config-field-wrapper");
$(fieldWrapper).html("");
if (data.configuration) {
var config;
@ -197,15 +197,18 @@ var loadDynamicDeviceTypeConfig = function (deviceType) {
var onDynamicConfigSubmit = function (deviceType) {
var errorMsgWrapper = "#" + deviceType + "-config-error-msg";
var errorMsg = "#" + deviceType + "-config-error-msg span";
var errorMsgWrapper = "#" + escapeSelector(deviceType + "-config-error-msg");
var errorMsg = "#" + escapeSelector(deviceType + "-config-error-msg span");
var filedRaw = '.' + escapeSelector(deviceType + '-config-row');
var filedName = "." + escapeSelector(deviceType + "-config-name");
var filedValue = "." + escapeSelector(deviceType + "-config-value");
var addConfigFormData = {};
var configList = [];
$('.' + deviceType + '-config-row').each(function () {
var configName = $(this).find("." + deviceType + "-config-name").val();
var configVal = $(this).find("." + deviceType + "-config-value").val();
$(filedRaw).each(function () {
var configName = $(this).find(filedName).val();
var configVal = $(this).find(filedValue).val();
if (configName && configName.trim() !== "" && configVal && configVal.trim() !== "") {
var configurationEntry = {};
configurationEntry.name = configName.trim();
@ -252,7 +255,8 @@ var onDynamicConfigSubmit = function (deviceType) {
};
var onDynamicConfigAddNew = function (deviceType, name, value) {
$("#" + deviceType + "-config-field-wrapper").append(
var fieldWrapper = "#" + escapeSelector(deviceType + "-config-field-wrapper");
$(fieldWrapper).append(
'<div class="row form-group ' + deviceType + '-config-row"' +
' id="' + deviceType + '-config-row-' + (++configRowId) + '">' +
'<div class="col-xs-3">' +
@ -272,5 +276,13 @@ var onDynamicConfigAddNew = function (deviceType, name, value) {
};
var onDynamicConfigRemove = function (deviceType, rawId) {
$("#" + deviceType + "-config-row-" + rawId).remove()
var fieldWrapper = "#" + escapeSelector(deviceType + "-config-row-" + rawId);
$(fieldWrapper).remove()
};
var escapeSelector = function (text) {
return text.replace(
/([$%&()*+,./:;<=>?@\[\\\]^\{|}~])/g,
'\\$1'
);
};