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 new ownership types and fix application updating issues

See merge request entgra/carbon-device-mgt!723
This commit is contained in:
Dharmakeerthi Lasantha 2021-01-29 14:36:32 +00:00
commit a61bd6b1db
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
View File

@ -1969,7 +1969,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
ApplicationDTO applicationDTO = getApplication(applicationId);
try {
ConnectionManagerUtil.beginDBTransaction();
if (!StringUtils.isEmpty(applicationUpdateWrapper.getName())){
if (!StringUtils.isEmpty(applicationUpdateWrapper.getName()) && !applicationDTO.getName()
.equals(applicationUpdateWrapper.getName())) {
if (applicationDAO
.isExistingAppName(applicationUpdateWrapper.getName().trim(), applicationDTO.getDeviceTypeId(),
tenantId)) {

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java
View File

@ -36,7 +36,7 @@ public class EnrolmentInfo implements Serializable {
}
public enum OwnerShip {
BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE, COSU
BYOD, COPE, WORK_PROFILE, GOOGLE_ENTERPRISE, COSU, FULLY_MANAGED, DEDICATED_DEVICE
}
@ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.",