Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

fhemweb.js: fixing issues on the detail page (Forum #129858)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26631 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-10-31 11:17:44 +00:00
parent 8883597c69
commit 279ec10327
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -4742,7 +4742,7 @@ FW_log($$)
<a id="FHEMWEB-attr-detailLinks"></a> <a id="FHEMWEB-attr-detailLinks"></a>
<li>detailLinks<br> <li>detailLinks<br>
Anzahl der Links, die auf der Detailseite unten angezeigt werden. Die 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. Voreinstellung ist 2.
</li> </li>
<br> <br>

2
fhem/fhem.pl
View File

@ -2808,6 +2808,8 @@ CommandRename($$)
return "Invalid characters in name (not A-Za-z0-9._): $new" return "Invalid characters in name (not A-Za-z0-9._): $new"
if(!goodDeviceName($new)); if(!goodDeviceName($new));
return "Cannot rename global" if($old eq "global"); return "Cannot rename global" if($old eq "global");
return "Cannot rename $old from itself"
if($cl && $cl->{SNAME} && $cl->{SNAME} eq $old);
%ntfyHash = (); %ntfyHash = ();
$defs{$new} = $defs{$old}; $defs{$new} = $defs{$old};

4
fhem/www/pgm2/fhemweb.js
View File

@ -501,7 +501,7 @@ FW_confirmDelete()
if(!ma || ma.length != 2) if(!ma || ma.length != 2)
return; return;
FW_removeLink(this); 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(); var nn = $(div).find("input").val();
if(!nn.match(/^[a-z0-9._]*$/i)) if(!nn.match(/^[a-z0-9._]*$/i))
return FW_okDialog("Illegal characters in the new name"); 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} ], {text:"Cancel", click:doClose} ],
close: doClose close: doClose