dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12157 from dashevchenko/mobileLayoutFix

Browse Source 
Fixed mobile layout configuration response
This commit is contained in:
Viacheslav Klimov 2024-12-02 12:30:40 +02:00 committed by GitHub
commit cbcd364237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/controller/MobileAppController.java
View File

@ -168,7 +168,7 @@ public class MobileAppController extends BaseController {
.collect(Collectors.toList()); .collect(Collectors.toList());
return JacksonUtil.toJsonNode(JacksonUtil.writeValueAsViewIgnoringNullFields(mobilePages, Views.Public.class)); return JacksonUtil.toJsonNode(JacksonUtil.writeValueAsViewIgnoringNullFields(mobilePages, Views.Public.class));
} else { } else {
return JacksonUtil.newArrayNode(); return null;
} }
} }

4
dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java
View File

@ -71,8 +71,8 @@ public class MobileAppBundleServiceImpl extends AbstractEntityService implements
return savedMobileApp; return savedMobileApp;
} catch (Exception e) { } catch (Exception e) {
checkConstraintViolation(e, checkConstraintViolation(e,
Map.of("android_app_id_unq_key", "Android 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!",
"ios_app_id_unq_key", "IOS mobile app already exists in another bundle!")); "mobile_app_bundle_ios_app_id_key", "IOS mobile app is already configured in another bundle!"));
throw e; throw e;
} }
} }