From 279ec1032757dc7a1ef31f24ed84845deda9a38c Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 31 Oct 2022 11:17:44 +0000
Subject: [PATCH] fhemweb.js: fixing issues on the detail page (Forum #129858)

git-svn-id: https://svn.fhem.de/fhem/trunk@26631 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm  | 2 +-
 fhem/fhem.pl             | 2 ++
 fhem/www/pgm2/fhemweb.js | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index aa970663f..a55b8e921 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -4742,7 +4742,7 @@ FW_log($$)
     <a id="FHEMWEB-attr-detailLinks"></a>
     <li>detailLinks<br>
         Anzahl der Links, die auf der Detailseite unten angezeigt werden. Die
-        weiteren Befehle werden in einem Auswahlmen&%uuml; angezeigt.
+        weiteren Befehle werden in einem Auswahlmen&uuml; angezeigt.
         Voreinstellung ist 2.
         </li>
         <br>
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index eb9cf22ef..0bfd44960 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -2808,6 +2808,8 @@ CommandRename($$)
   return "Invalid characters in name (not A-Za-z0-9._): $new"
                         if(!goodDeviceName($new));
   return "Cannot rename global" if($old eq "global");
+  return "Cannot rename $old from itself"
+        if($cl && $cl->{SNAME} && $cl->{SNAME} eq $old);
 
   %ntfyHash = ();
   $defs{$new} = $defs{$old};
diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index 797644cf3..c4605d3a0 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -501,7 +501,7 @@ FW_confirmDelete()
     if(!ma || ma.length != 2)
       return;
     FW_removeLink(this);
-    $(this).click(function(e){ FW_delete(ma[1], ma[0]) });
+    $(this).click(function(e){ FW_delete(ma[1], ma[0]); return false; });
   });
 }
 
@@ -520,7 +520,7 @@ FW_renameDevice(dev)
         var nn = $(div).find("input").val();
         if(!nn.match(/^[a-z0-9._]*$/i))
           return FW_okDialog("Illegal characters in the new name");
-        location.href = addcsrf(FW_root+"?cmd=rename "+dev+" "+nn);
+        location.href=addcsrf(FW_root+"?cmd=rename "+dev+" "+nn+"&detail="+nn);
       }},
       {text:"Cancel", click:doClose} ],
     close: doClose