Skip to content

webui: name the object in the delete confirmation dialogs #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jens-maus merged 1 commit into from
Oct 17, 2026
Merged

webui: name the object in the delete confirmation dialogs #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/webui/rega/www/pages/tabs/admin/systemvars.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@
Write("<table cellspacing='0' cellpadding='0' style='width:100%;'><tr>");
Write("<td class='CLASS05210'>");
string sClassName = "StdButton";
string sOnclick = "DeleteSysVar("#sv.ID()#");";
string sDelName = sv.Name().Replace("\\", "\\x5C").Replace("'", "\\x27").Replace("\"", "\\x22").Replace("<", "\\x3C").Replace(">", "\\x3E").Replace("&", "\\x26");
string sOnclick = "DeleteSysVar("#sv.ID()#",\""#sDelName#"\");";
if( sv.Unerasable() )
{
sClassName = sClassName#"Inactive";
Expand Down Expand Up @@ -458,10 +459,11 @@
}
}

DeleteSysVar = function(id)
DeleteSysVar = function(id,name)
{
var _id_ = id;
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveSysVar"), function(result) {
var _name_ = String(name).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveSysVar").replace(/%s/, function() { return _name_; }), function(result) {
if (result == YesNoDialog.RESULT_YES) { DeleteObject(_id_); }
});
};
Expand Down
8 changes: 5 additions & 3 deletions src/webui/rega/www/pages/tabs/admin/userAdministration.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@
Write("<td style='text-align:center; vertical-align: middle;' class='TblUserAdministration CLASS05303' >")
Write("<div class='StdButton CLASS05304' onclick='editUser("#user.ID()#")'>${btnEdit}</div>")
if (system.GetSessionVar('sessionUserID') != user.ID()) {
Write("<div class='StdButton CLASS05304' onclick='deleteUser("#user.ID()#")'>${btnRemove}</div>")
string sDelName = user.Name().Replace("\\", "\\x5C").Replace("'", "\\x27").Replace("\"", "\\x22").Replace("<", "\\x3C").Replace(">", "\\x3E").Replace("&", "\\x26");
Write("<div class='StdButton CLASS05304' onclick='deleteUser("#user.ID()#",\""#sDelName#"\")'>${btnRemove}</div>")
}
Write("</td>")
Write("</tr>")
Expand Down Expand Up @@ -186,10 +187,11 @@
CreatePopup(ID_USER_ACCOUNT_CONFIG_ADMIN, id);
}

deleteUser = function(id)
deleteUser = function(id,name)
{
var _id_ = id;
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveUser"), function(result) {
var _name_ = String(name).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveUser").replace(/%s/, function() { return _name_; }), function(result) {
if (result == YesNoDialog.RESULT_YES)
{
var url = "/esp/system.htm?sid=" + SessionId;
Expand Down
8 changes: 5 additions & 3 deletions src/webui/rega/www/pages/tabs/user/favOverview.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@
Write('<div class="CLASS06412">Bearbeiten...</div>');
}
if ((bDelAllowed) && (!oFav.Unerasable())) {
Write('<div class="CLASS06409 StdButton" onclick="DeleteFavorite('#sID#');">${btnRemove}</div>');
string sDelName = oFav.Name().Replace("\\", "\\x5C").Replace("'", "\\x27").Replace("\"", "\\x22").Replace("<", "\\x3C").Replace(">", "\\x3E").Replace("&", "\\x26");
Write('<div class="CLASS06409 StdButton" onclick="DeleteFavorite('#sID#',\''#sDelName#'\');">${btnRemove}</div>');
}
else {
Write('<div class="CLASS06412">${btnRemove}</div>');
Expand Down Expand Up @@ -416,10 +417,11 @@
updateContent("/pages/tabs/user/newFav.htm");
}

DeleteFavorite = function(id)
DeleteFavorite = function(id,name)
{
var _id_ = id;
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveFavorite"), function(result) {
var _name_ = String(name).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
new YesNoDialog(translateKey("dialogSafetyCheck"), translateKey("dialogQuestionRemoveFavorite").replace(/%s/, function() { return _name_; }), function(result) {
if (result == YesNoDialog.RESULT_YES) { iseFavorites.RemoveList(_id_); }
});
};
Expand Down
2 changes: 1 addition & 1 deletion src/webui/www/webui/js/lang/de/translate.lang.extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ jQuery.extend(true,langJSON, {
"channelModeHumidityLimiter" : "Feuchtigkeitsbegrenzer",
"channelModeTactileSwitch" : "Taster",
"channelModeTemperatureLimiter" : "Temperaturbegrenzer",
"dialogQuestionRemoveInternalLink" : "<span class='attention'>ACHTUNG:</span><br/><br>Es handelt sich hier um eine interne Verkn%FCpfung des Ger%E4tes. Das L%F6schen dieser Verkn%FCpfung kann dazu f%FChren, dass das Ger%E4t unbedienbar wird. In diesem Fall m%FCssen Sie die Verkn%FCpfung neu erstellen.<br/><br/>M%F6chten Sie die Verkn%FCpfung wirklich l%F6schen?",
"dialogQuestionRemoveInternalLink" : "<span class='attention'>ACHTUNG:</span><br/><br>Es handelt sich hier um eine interne Verkn%FCpfung des Ger%E4tes. Das L%F6schen dieser Verkn%FCpfung kann dazu f%FChren, dass das Ger%E4t unbedienbar wird. In diesem Fall m%FCssen Sie die Verkn%FCpfung neu erstellen.<br/><br/>M%F6chten Sie die Verkn%FCpfung '%s' wirklich l%F6schen?",
"descriptionTransmitterDataTransmissionCondition0" : "<b>Modus 1</b><br/><br/>Senden auf Pegel%E4nderung am Daten%FCbertragungspin (DU30) von HIGH- auf LOW-Pegel.",
"descriptionTransmitterDataTransmissionCondition1" : "<b>Modus 2</b><br/><br/>Senden auf Pegel%E4nderung am Daten%FCbertragungspin (DU30) von LOW- auf HIGH-Pegel.",
"descriptionTransmitterDataTransmissionCondition2" : "<b>Modus 3</b><br/><br/>Senden auf Pegel%E4nderung am Daten%FCbertragungspin (DU30) auf jede Logikpegel%E4nderung.",
Expand Down
8 changes: 4 additions & 4 deletions src/webui/www/webui/js/lang/de/translate.lang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,10 @@ jQuery.extend(true,langJSON, {
"dialogInfo" : "Info",
"dialogHint" : "Hinweis",
"dialogQuestionRemoveProgram" : "M%F6chten Sie das Programm '%s' wirklich l%F6schen?",
"dialogQuestionRemoveLink" : "M%F6chten Sie die Verkn%FCpfung wirklich l%F6schen?",
"dialogQuestionRemoveUser" : "M%F6chten Sie den Benutzer wirklich l%F6schen?",
"dialogQuestionRemoveSysVar" : "M%F6chten Sie die Systemvariable wirklich l%F6schen?",
"dialogQuestionRemoveFavorite" : "M%F6chten Sie den Favoriten wirklich l%F6schen?",
"dialogQuestionRemoveLink" : "M%F6chten Sie die Verkn%FCpfung '%s' wirklich l%F6schen?",
"dialogQuestionRemoveUser" : "M%F6chten Sie den Benutzer '%s' wirklich l%F6schen?",
"dialogQuestionRemoveSysVar" : "M%F6chten Sie die Systemvariable '%s' wirklich l%F6schen?",
"dialogQuestionRemoveFavorite" : "M%F6chten Sie den Favoriten '%s' wirklich l%F6schen?",
"dialogQuestionRemoveCFG" : "M%F6chten Sie den " + HMIdentifier.de.HomeMaticCFGAdapter + " wirklich l%F6schen?",
"dialogQuestionRemoveExtraSoftware" : "Wollen Sie die Zusatzsoftware wirklich entfernen?",
"dialogQuestionRestart" : "Best%E4tigen Sie hier, um den Neustart durchzuf%FChren.",
Expand Down
2 changes: 1 addition & 1 deletion src/webui/www/webui/js/lang/en/translate.lang.extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ jQuery.extend(true, langJSON, {
"channelModeHumidityLimiter" : "Humidity limiter",
"channelModeTactileSwitch" : "Push-button",
"channelModeTemperatureLimiter" : "Temperature limiter",
"dialogQuestionRemoveInternalLink" : "<span class='attention'>PLEASE NOTE:</span><br/><br>This is an internal connection of the device. It may occur that the device cannot be operated any more if you delete this connection. In this case, you have to create the connection again.<br/><br/>Do you really want to delete the connection?",
"dialogQuestionRemoveInternalLink" : "<span class='attention'>PLEASE NOTE:</span><br/><br>This is an internal connection of the device. It may occur that the device cannot be operated any more if you delete this connection. In this case, you have to create the connection again.<br/><br/>Do you really want to delete the connection '%s'?",
"descriptionTransmitterDataTransmissionCondition0" : "<b>Mode 1</b><br/><br/>Transmit on level change of data transmission pin (DU30) from HIGH to LOW level.",
"descriptionTransmitterDataTransmissionCondition1" : "<b>Mode 2</b><br/><br/>Transmit on level change of data transmission pin (DU30) from LOW to HIGH level.",
"descriptionTransmitterDataTransmissionCondition2" : "<b>Mode 3</b><br/><br/>Transmit on level change of data transmission pin (DU30) on every logic level change.",
Expand Down
8 changes: 4 additions & 4 deletions src/webui/www/webui/js/lang/en/translate.lang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ jQuery.extend(true,langJSON, {
"dialogInfo" : "Info",
"dialogHint" : "Please note",
"dialogQuestionRemoveProgram" : "Do you really want to delete the program '%s'?",
"dialogQuestionRemoveLink" : "Do you really want to delete the connection?",
"dialogQuestionRemoveUser" : "Do you really want to delete the user?",
"dialogQuestionRemoveSysVar" : "Do you really want to delete the system variable?",
"dialogQuestionRemoveFavorite" : "Do you really want to delete the favourite?",
"dialogQuestionRemoveLink" : "Do you really want to delete the connection '%s'?",
"dialogQuestionRemoveUser" : "Do you really want to delete the user '%s'?",
"dialogQuestionRemoveSysVar" : "Do you really want to delete the system variable '%s'?",
"dialogQuestionRemoveFavorite" : "Do you really want to delete the favourite '%s'?",
"dialogQuestionRemoveCFG" : "Do you really want to delete the " + HMIdentifier.en.HomeMaticCFGAdapter + "?",
"dialogQuestionRemoveExtraSoftware" : "Do you really want to delete the additional software?",
"dialogQuestionRestart" : "Please click here to perform the restart?",
Expand Down
2 changes: 1 addition & 1 deletion src/webui/www_source/config/js/ic_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ RemoveLink = function(iface, sender_address, receiver_address, sender_type, redi
{
var questionRemoveLink = ((iface == "HmIP-RF") && (sender_type != "HmIP-SMI55") && (sender_type != "HmIP-SMI55-A") && (sender_address.split(":")[0] == receiver_address.split(":")[0])) ? translateKey('dialogQuestionRemoveInternalLink') : translateKey('dialogQuestionRemoveLink');

new YesNoDialog(translateKey('dialogSafetyCheck'), questionRemoveLink, function(result) {
new YesNoDialog(translateKey('dialogSafetyCheck'), questionRemoveLink.replace('%s', sender_address+' - '+receiver_address), function(result) {
if (result == YesNoDialog.RESULT_YES)
{
ResetPostString();
Expand Down