Merge branch 'master' into 'master'

Fix app installing issue in kiosk

See merge request entgra/carbon-device-mgt!372
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit f603ed0f97

@ -119,11 +119,11 @@ public class SQLServerApplicationDAOImpl extends GenericApplicationDAOImpl {
} }
if (filter.getLimit() == -1) { if (filter.getLimit() == -1) {
sql = sql.replace("OFFSET ? ROWS FETCH NEXT ? ROWS ONLY", ""); sql = sql.replace("ORDER BY ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY", "");
} }
String sortingOrder = "ASC"; String sortingOrder = "ASC";
if (!StringUtils.isEmpty(filter.getSortBy() )) { if (!StringUtils.isEmpty(filter.getSortBy())) {
sortingOrder = filter.getSortBy(); sortingOrder = filter.getSortBy();
} }
sql += " ORDER BY APP_ID " + sortingOrder; sql += " ORDER BY APP_ID " + sortingOrder;

@ -51,6 +51,7 @@ public class MDMAndroidOperationUtil {
EnterpriseApplication enterpriseApplication = new EnterpriseApplication(); EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
enterpriseApplication.setType(application.getType().toString()); enterpriseApplication.setType(application.getType().toString());
enterpriseApplication.setUrl(application.getLocation()); enterpriseApplication.setUrl(application.getLocation());
enterpriseApplication.setAppIdentifier(application.getIdentifier());
operation.setPayLoad(enterpriseApplication.toJSON()); operation.setPayLoad(enterpriseApplication.toJSON());
break; break;
case PUBLIC: case PUBLIC:

Loading…
Cancel
Save