Browse Source
Merge pull request #12157 from dashevchenko/mobileLayoutFix
Fixed mobile layout configuration response
pull/12161/head
Viacheslav Klimov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
3 deletions
-
application/src/main/java/org/thingsboard/server/controller/MobileAppController.java
-
dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java
|
|
|
@ -168,7 +168,7 @@ public class MobileAppController extends BaseController { |
|
|
|
.collect(Collectors.toList()); |
|
|
|
return JacksonUtil.toJsonNode(JacksonUtil.writeValueAsViewIgnoringNullFields(mobilePages, Views.Public.class)); |
|
|
|
} else { |
|
|
|
return JacksonUtil.newArrayNode(); |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -71,8 +71,8 @@ public class MobileAppBundleServiceImpl extends AbstractEntityService implements |
|
|
|
return savedMobileApp; |
|
|
|
} catch (Exception e) { |
|
|
|
checkConstraintViolation(e, |
|
|
|
Map.of("android_app_id_unq_key", "Android mobile app already exists in another bundle!", |
|
|
|
"ios_app_id_unq_key", "IOS mobile app already exists in another bundle!")); |
|
|
|
Map.of("mobile_app_bundle_android_app_id_key", "Android mobile app is already configured in another bundle!", |
|
|
|
"mobile_app_bundle_ios_app_id_key", "IOS mobile app is already configured in another bundle!")); |
|
|
|
throw e; |
|
|
|
} |
|
|
|
} |
|
|
|
|