mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-01 01:09:47 +00:00
commands lookup fix
git-svn-id: https://svn.fhem.de/fhem/trunk@4712 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
070559fede
commit
fe9c451ded
@ -388,7 +388,7 @@ readingsGroup_2html($)
|
|||||||
my $cmd = $3;
|
my $cmd = $3;
|
||||||
$txt = FW_makeImage( $icon, $icon, "icon" );
|
$txt = FW_makeImage( $icon, $icon, "icon" );
|
||||||
|
|
||||||
$cmd = lookup2($commands,$name,undef,$icon) if( !defined($cmd) );
|
$cmd = lookup2($commands,$name,$d,$icon) if( !defined($cmd) );
|
||||||
($txt,undef) = readingsGroup_makeLink($txt,undef,$cmd);
|
($txt,undef) = readingsGroup_makeLink($txt,undef,$cmd);
|
||||||
|
|
||||||
} elsif( $first || $multi == 1 ) {
|
} elsif( $first || $multi == 1 ) {
|
||||||
@ -407,7 +407,7 @@ readingsGroup_2html($)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
my $inform_id = "";
|
my $inform_id = "";
|
||||||
$inform_id = "informId=\"$d-$item.item\"" if( $readings );
|
$inform_id = "informId=\"$d-i$item.item\"" if( $readings );
|
||||||
$ret .= "<td><div $name_style $inform_id>$txt</div></td>";
|
$ret .= "<td><div $name_style $inform_id>$txt</div></td>";
|
||||||
$first = 0;
|
$first = 0;
|
||||||
next;
|
next;
|
||||||
@ -679,11 +679,12 @@ readingsGroup_Notify($$)
|
|||||||
my $icon = $1;
|
my $icon = $1;
|
||||||
my $cmd = $3;
|
my $cmd = $3;
|
||||||
|
|
||||||
|
$cmd = lookup2($commands,$name,$h->{NAME},$icon) if( !defined($cmd) );
|
||||||
$txt = FW_makeImage( $icon, $icon, "icon" );
|
$txt = FW_makeImage( $icon, $icon, "icon" );
|
||||||
($txt,undef) = readingsGroup_makeLink($txt,undef,$cmd);
|
($txt,undef) = readingsGroup_makeLink($txt,undef,$cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandTrigger( "", "$name $item.item: $txt" );
|
CommandTrigger( "", "$name i$item.item: $txt" );
|
||||||
}
|
}
|
||||||
|
|
||||||
next;
|
next;
|
||||||
|
Loading…
Reference in New Issue
Block a user