diff --git a/fhem/CHANGED b/fhem/CHANGED index a996dd6db..e07bc1fbb 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 95_Dashboard: fixes an issue causing devices with interal attribute + group to not appear in the dashboard. - bugfix: 93_DbRep: include day before and next in calculation if Timestamp is exactly 'YYYY-MM-DD 00:00:00' - feature: 93_DbRep: Internal "LASTCMD" added, diff --git a/fhem/FHEM/95_Dashboard.pm b/fhem/FHEM/95_Dashboard.pm index fd61501eb..30d281a2a 100644 --- a/fhem/FHEM/95_Dashboard.pm +++ b/fhem/FHEM/95_Dashboard.pm @@ -596,9 +596,9 @@ sub BuildDashboardTab($$) if (@index > 0) { for (my $j=0; $j<@index;$j++) { my $groupname = @groups[$index[$j]]; - $groupname .= ':' . 'group=' . $groupname; + $groupname .= '$$$' . 'group=' . $groupname; if (@stabgroup > 1) { - $groupname .= ':' . $stabgroup[1]; + $groupname .= '$$$' . $stabgroup[1]; } push(@tabdevicegroups,$groupname); } @@ -609,7 +609,7 @@ sub BuildDashboardTab($$) # add sortings for groups not already having a defined sorting for (my $i=0;$i<@tabdevicegroups;$i++) { - my @stabgroup = split(":", trim($tabdevicegroups[$i])); + my @stabgroup = split(/\$\$\$/, trim($tabdevicegroups[$i])); my $matchGroup = "," . quotemeta(trim($stabgroup[0])) . ","; if ($tabsortings !~ m/$matchGroup/) { @@ -717,7 +717,7 @@ sub BuildGroupWidgets($$$$$) { foreach my $singlegroup (@devicegroups) { # make sure that splitting with colon is not destroying the devspec that might # also contain a colon followed by a filter - my ($groupname, $groupdevices, $groupicon) = split(/:(?!FILTER=)/, $singlegroup); + my ($groupname, $groupdevices, $groupicon) = split(/\$\$\$/, $singlegroup); my @values = ($groupdevices, $groupicon); $groups{$groupname} = \@values; @@ -989,6 +989,8 @@ GetActiveTab ($) 1; =pod +=item summary Dashboard for showing multiple devices sorted in tabs +=item summary_DE Dashboard zur Anzeige mehrerer Geräte in verschiedenen Tabs =begin html