mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

01_FHEMWEB.pm: sortby is avaluated if enclosed in {}

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13378 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2017-02-10 19:38:09 +00:00
parent 654696244a
commit c9796d1df1
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -1690,6 +1690,27 @@ FW_makeDeviceLine($$$$$)
FW_pO "</tr>"; FW_pO "</tr>";
} }
sub
FW_sortIndex($)
{
my ($d) = @_;
return $d if(!$attr{$d});
my $val = $attr{$d}{sortby};
if($val) {
return $val =~ m/^{.*}/ ? AnalyzePerlCommand($FW_chash, $val) : lc($val);
}
if($FW_room) {
$val = $attr{$d}{"alias_$FW_room"};
return $val if($val);
}
$val = $attr{$d}{"alias"};
return $val if($val);
return $d;
}
######################## ########################
# Show the overview of devices in one room # Show the overview of devices in one room
# room can be a room, all or Unsorted # room can be a room, all or Unsorted
@@ -1717,7 +1738,7 @@ FW_showRoom()
if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) { if($modules{$defs{$dev}{TYPE}}{FW_atPageEnd}) {
$usuallyAtEnd{$dev} = 1; $usuallyAtEnd{$dev} = 1;
if(!AttrVal($dev, "group", undef)) { if(!AttrVal($dev, "group", undef)) {
$sortIndex{$dev} = lc(AttrVal($dev,"sortby",FW_alias($dev))); $sortIndex{$dev} = FW_sortIndex($dev);
push @atEnds, $dev; push @atEnds, $dev;
next; next;
} }
@@ -1725,7 +1746,7 @@ FW_showRoom()
next if(!$FW_types{$dev}); # FHEMWEB connection, missed due to caching next if(!$FW_types{$dev}); # FHEMWEB connection, missed due to caching
foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) { foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) {
next if($FW_hiddengroup{$grp}); next if($FW_hiddengroup{$grp});
$sortIndex{$dev} = lc(AttrVal($dev,"sortby",FW_alias($dev))); $sortIndex{$dev} = FW_sortIndex($dev);
$group{$grp}{$dev} = 1; $group{$grp}{$dev} = 1;
} }
} }
@@ -3641,7 +3662,8 @@ FW_widgetOverride($$)
<li>sortby<br> <li>sortby<br>
Take the value of this attribute when sorting the devices in the room Take the value of this attribute when sorting the devices in the room
overview instead of the alias, or if that is missing the devicename overview instead of the alias, or if that is missing the devicename
itself. itself. If the sortby value is enclosed in {} than it is evaluated as a
perl expression.
</li> </li>
<br> <br>
@@ -4370,7 +4392,9 @@ FW_widgetOverride($$)
<li>sortby<br> <li>sortby<br>
Der Wert dieses Attributs wird zum sortieren von Ger&auml;ten in Der Wert dieses Attributs wird zum sortieren von Ger&auml;ten in
R&auml;umen verwendet, sonst w&auml;re es der Alias oder, wenn keiner R&auml;umen verwendet, sonst w&auml;re es der Alias oder, wenn keiner
da ist, der Ger&auml;tename selbst. da ist, der Ger&auml;tename selbst. Falls der Wert des sortby
Attributes in {} eingeschlossen ist, dann wird er als ein perl Ausdruck
evaluiert.
</li><br> </li><br>
<a name="showUsedFiles"></a> <a name="showUsedFiles"></a>