Merge branch 'master' into 'master'

Add new ownership types and fix application updating issues

See merge request entgra/carbon-device-mgt!723
revert-70ac1926
Dharmakeerthi Lasantha 4 years ago
commit a61bd6b1db

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

@ -36,7 +36,7 @@ public class EnrolmentInfo implements Serializable {
} }
public enum OwnerShip { 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.", @ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.",

Loading…
Cancel
Save