OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge of AddonInfo (masterAddonInfo field) (#4309) 

This fix allows having translated label for bindings when showing list of installed bindings in Main UI parameters.

Fix openhab/openhab-webui#2639

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/4314/head
lolodomo 2024-07-13 15:32:47 +02:00 committed by GitHub
parent 71b50c5462
commit 24d1ba0b2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/AddonInfoRegistry.java
View File

@ -106,8 +106,8 @@ public class AddonInfoRegistry {
builder.withName(b.getName()); builder.withName(b.getName());
builder.withDescription(b.getDescription()); builder.withDescription(b.getDescription());
} }
if (!(a.isMasterAddonInfo() || b.isMasterAddonInfo())) { if (!a.isMasterAddonInfo() && b.isMasterAddonInfo()) {
builder.isMasterAddonInfo(false); builder.isMasterAddonInfo(true);
} }
if (a.getConnection() == null && b.getConnection() != null) { if (a.getConnection() == null && b.getConnection() != null) {
builder.withConnection(b.getConnection()); builder.withConnection(b.getConnection());