Merge branch '2209bug-tray' into 'yhkylin/v101'

fix bug #163269 编辑网络连接IP信息时默认网关为非必填项

See merge request kylinos-src/kylin-nm!119
This commit is contained in:
赵世旭 2023-03-16 03:21:19 +00:00
commit 3d575077f4
2 changed files with 8 additions and 9 deletions

View File

@ -160,10 +160,10 @@ bool CreatNetPage::checkConnectBtnIsEnabled()
return false;
}
if (gateWayEdit->text().isEmpty() || !getTextEditState(gateWayEdit->text())) {
qDebug() << "create ipv4 gateway empty or invalid";
return false;
}
// if (gateWayEdit->text().isEmpty() || !getTextEditState(gateWayEdit->text())) {
// qDebug() << "create ipv4 gateway empty or invalid";
// return false;
// }
if (firstDnsEdit->text().isEmpty() && !secondDnsEdit->text().isEmpty()) {
qDebug() << "create ipv4 dns sort invalid";

View File

@ -253,7 +253,6 @@ void Ipv6Page::setControlEnabled(bool check)
} else {
ipv6AddressEdit->setPlaceholderText(tr("Required")); //必填
lengthEdit->setPlaceholderText(tr("Required")); //必填
gateWayEdit->setPlaceholderText(tr("Required")); //必填
}
ipv6AddressEdit->setEnabled(check);
@ -313,10 +312,10 @@ bool Ipv6Page::checkConnectBtnIsEnabled()
return false;
}
if (gateWayEdit->text().isEmpty() || !getIpv6EditState(gateWayEdit->text())) {
qDebug() << "ipv6 gateway empty or invalid";
return false;
}
// if (gateWayEdit->text().isEmpty() || !getIpv6EditState(gateWayEdit->text())) {
// qDebug() << "ipv6 gateway empty or invalid";
// return false;
// }
if (firstDnsEdit->text().isEmpty() && !secondDnsEdit->text().isEmpty()) {
qDebug() << "ipv6 dns sort invalid";