FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm: revert FW_widgetFallbackFn changed (Forum #136049)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28235 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2023-12-02 09:34:43 +00:00
parent 34017567bb
commit 06e8a926df
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/01_FHEMWEB.pm
View File

@ -3612,25 +3612,22 @@ FW_widgetFallbackFn()
# noArg is needed for fhem.cfg.demo / Cinema # noArg is needed for fhem.cfg.demo / Cinema
return "" if(!$values || $values eq "noArg"); return "" if(!$values || $values eq "noArg");
my $reading; my($source) = split(' ', $cmd, 2); # cmd part only, #136049
($cmd, $reading) = split(' ', $cmd, 2) if($values !~ m/^colorpicker,/);
$reading = $cmd if(!defined($reading));
my $current; my $current;
if($cmd eq "desired-temp" || $cmd eq "desiredTemperature") { if($cmd eq "desired-temp" || $cmd eq "desiredTemperature") {
$current = ReadingsVal($d, $cmd, 20); $current = ReadingsVal($d, $cmd, 20);
$current =~ s/ .*//; # Cut off Celsius $current =~ s/ .*//; # Cut off Celsius
$current = sprintf("%2.1f", int(2*$current)/2) if($current =~ m/[0-9.-]/); $current = sprintf("%2.1f", int(2*$current)/2) if($current =~ m/[0-9.-]/);
} else { } else {
$current = ReadingsVal($d, $reading, undef); $current = ReadingsVal($d, $source, undef);
if( !defined($current) ) { if( !defined($current) ) {
$reading = 'state'; $source = 'state';
$current = Value($d); $current = Value($d);
} }
$current =~ s/$cmd //; $current =~ s/$cmd //;
$current = ReplaceEventMap($d, $current, 1); $current = ReplaceEventMap($d, $current, 1);
} }
return "<td><div class='fhemWidget' cmd='$cmd' reading='$reading' ". return "<td><div class='fhemWidget' cmd='$cmd' reading='$source' ".
"dev='$d' arg='$values' current='$current'></div></td>"; "dev='$d' arg='$values' current='$current'></div></td>";
} }
# Widgets END # Widgets END