Fixes #4146

florian030 · florian030 · commit 8de24d4a4c4d · 2016-09-14T12:49:30.000+02:00
diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php
@@ -85,10 +85,10 @@ function onShowEnd() {
 			$clients = $app->db->queryAllRecords($sql);
 			$client_select = '';
 			if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
-			$tmp_data_record = $app->tform->getDataRecord($this->id);
+			if($this->id > 0) $tmp_data_record = $app->tform->getDataRecord($this->id); else $tmp_data_record = $this->dataRecord;
 			if(is_array($clients)) {
 				foreach( $clients as $client) {
-					$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
+					$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"] || $client["groupid"] == $tmp_data_record["client_group_id"])?'SELECTED':'';
 					$client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ function onShowEnd() {`
`85`	`85`	`$clients = $app->db->queryAllRecords($sql);`
`86`	`86`	`$client_select = '';`
`87`	`87`	`if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";`
`88`		`- $tmp_data_record = $app->tform->getDataRecord($this->id);`
	`88`	`+ if($this->id > 0) $tmp_data_record = $app->tform->getDataRecord($this->id); else $tmp_data_record = $this->dataRecord;`
`89`	`89`	`if(is_array($clients)) {`
`90`	`90`	`foreach( $clients as $client) {`
`91`		`- $selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';`
	`91`	`+ $selected = ($client["groupid"] == $tmp_data_record["sys_groupid"] \|\| $client["groupid"] == $tmp_data_record["client_group_id"])?'SELECTED':'';`
`92`	`92`	`$client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";`
`93`	`93`	`}`
`94`	`94`	`}`