From cb631b419e77e3ebe6314aa20861d9c11c76e30f Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 22 Dec 2019 17:23:46 +0000 Subject: [PATCH] 01_FHEMWEB.pm: empty room in FW_summaryFn called from doDetail (Forum #106551) git-svn-id: https://svn.fhem.de/fhem/trunk@20810 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index c0527b9e4..67f5a735a 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1456,7 +1456,7 @@ FW_doDetail($) my %extPage = (); if( $show eq 'iconOnly' ) { - my ($allSets, $cmdlist, $txt) = FW_devState($d, $FW_room, \%extPage); + my ($allSets, $cmdlist, $txt) = FW_devState($d, "", \%extPage); FW_pO "
$txt
"; @@ -1479,7 +1479,7 @@ FW_doDetail($) FW_pO "
"; FW_pO "DeviceOverview"; FW_pO ""; - FW_makeDeviceLine($d,1,\%extPage,$nameDisplay,\%usuallyAtEnd); + FW_makeDeviceLine($d,-1,\%extPage,$nameDisplay,\%usuallyAtEnd); FW_pO "
"; } } @@ -1799,7 +1799,7 @@ FW_makeDeviceLine($$$$$) } } - my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf, $extPage); + my ($allSets, $cmdlist, $txt) = FW_devState($d, $row==-1 ? "":$rf, $extPage); if($cmdlist) { my $cl2 = $cmdlist; $cl2 =~ s/ [^:]*//g; $cl2 =~ s/:/ /g; # Forum #74053 $allSets = "$allSets $cl2"; @@ -3280,7 +3280,7 @@ FW_devState($$@) $extPage = \%hash; } no strict "refs"; - my $newtxt = &{$sfn}($FW_wname, $d, $FW_room, $extPage); + my $newtxt = &{$sfn}($FW_wname, $d, $rf ? $FW_room : "", $extPage); use strict "refs"; $txt = $newtxt if(defined($newtxt)); # As specified }