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 
Payload improvements in add new  policy feature  in React App

See merge request entgra/carbon-device-mgt!472
This commit is contained in:
Dharmakeerthi Lasantha 2020-03-20 06:25:30 +00:00
commit 2a20c06c46
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Policies/components/AddPolicy/components/PublishDevices/index.js vendored
View File

@ -30,7 +30,7 @@ class PublishDevices extends React.Component {
this.props.form.validateFields((err, values) => { this.props.form.validateFields((err, values) => {
if (!err) { if (!err) {
if (isPublish) { if (isPublish) {
Object.assign(values, { active: isPublish }); values = { ...values, ...{ active: isPublish } };
} }
this.props.getPolicyPayloadData(formName, values); this.props.getPolicyPayloadData(formName, values);
} }

16
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Policies/components/AddPolicy/index.js vendored
View File

@ -65,14 +65,14 @@ class AddPolicy extends React.Component {
devicetype: selectedPlatformData.deviceType, devicetype: selectedPlatformData.deviceType,
}; };
let payload = Object.assign( let payload = {
newPolicyPayload, ...newPolicyPayload,
publishDevicesData, ...publishDevicesData,
policyProfile, ...policyProfile,
policyTypeData, ...policyTypeData,
groupData, ...groupData,
{ profile: profile }, ...{ profile: profile },
); };
console.log(payload); console.log(payload);
}; };

17
components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/SubFormList.java
View File

@ -1,3 +1,20 @@
/*
* Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
*
* Entgra (Pvt) Ltd. 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.
*/
package org.wso2.carbon.device.mgt.extensions.device.type.template.config; package org.wso2.carbon.device.mgt.extensions.device.type.template.config;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;