From 4aaa5b9b47d50b3c3f50ddea8f85625247e10ea2 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sun, 30 Sep 2012 06:08:12 +0000
Subject: [PATCH] FHEMWEB: weblink with group attribute is shown together with
 other elements

git-svn-id: https://svn.fhem.de/fhem/trunk@1902 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED            |  1 +
 fhem/FHEM/01_FHEMWEB.pm | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 1c6e3c7f3..c2f16420d 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -62,6 +62,7 @@
   - feature: module IPCAM added. (M. Fischer)
   - feature: module HTTPSRV added (Boris)
   - feature: module FLOORPLAN added (Uli Maass)
+  - bugfix:  FHEMWEB: weblink with group attribute is shown together with other elements
 
 - 2011-12-31 (5.2)
   - bugfix:  applying smallscreen attributes to firefox/opera
diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 0e2d1279f..094c381ff 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1008,7 +1008,7 @@ FW_showRoom()
 
   my %group;
   foreach my $dev (@devs) {
-    next if($defs{$dev}{TYPE} eq "weblink");
+    next if($defs{$dev}{TYPE} eq "weblink" && !AttrVal($dev, "group", undef));
     foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) {
       $group{$grp}{$dev} = 1;
     }
@@ -1047,9 +1047,18 @@ FW_showRoom()
       }
       $row++;
 
+      if($type eq "weblink") {
+        FW_pO "<td>";
+        FW_showWeblink($d, $defs{$d}{LINK}, $defs{$d}{WLTYPE}, undef);
+        FW_pO "</td>";
+        next;
+      }
+
       my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf);
       FW_pO "<td id=\"$d\">$txt";
 
+      ######
+      # Commands, slider, dropdown
       if(!$FW_ss) {
         FW_pO "</td>";
         if($cmdlist) {
@@ -1125,7 +1134,7 @@ FW_showRoom()
   foreach my $d (sort @list) {
     next if(IsIgnored($d));
     my $type = $defs{$d}{TYPE};
-    next if(!$type || $type ne "weblink");
+    next if(!$type || $type ne "weblink" || AttrVal($d, "group", undef));
 
     $buttons = FW_showWeblink($d, $defs{$d}{LINK}, $defs{$d}{WLTYPE}, $buttons);
   }