Skip to content

Commit cd84fcc

Browse files
author
Marius Burkard
committed
Merge branch '6334-show-name-to-delete' into 'develop'
Show the client name on the delete confirmation page Closes #6334 See merge request ispconfig/ispconfig3!1601
2 parents 2ee2728 + 46c7e58 commit cd84fcc

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

interface/web/client/client_del.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ function onDelete() {
110110
$table_list = array();
111111
$client_group_id = $app->functions->intval($client_group['groupid']);
112112
if($client_group_id > 1) {
113+
114+
$client = $app->db->queryOneRecord("SELECT CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
115+
116+
$app->tpl->setVar('contactname', $client['contactname']);
117+
113118
foreach($this->tables as $table => $field) {
114119
if($table != '') {
115120
$records = $app->db->queryAllRecords("SELECT * FROM ?? WHERE sys_groupid = ?", $table, $client_group_id);

interface/web/client/templates/client_del.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class='page-header'><h1><tmpl_var name="list_head_txt"></h1></div>
1+
<div class='page-header'><h1><tmpl_var name="list_head_txt"> <tmpl_var name="contactname"></h1></div>
22
<tmpl_if name='number_records'>
33
<tmpl_var name="delete_explanation">:<br /><br />
44
<div class="table-wrapper marginTop15">

0 commit comments

Comments
 (0)