uni-days/sea_transport_project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Post done fixes

Browse source
This commit is contained in:
Andrew nuark G 2020-12-23 19:21:23 +07:00
parent 2be2e9f5e3
commit 0dab9e1eb2
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sea_transport/system/object_system.cpp
View file

@ -66,11 +66,11 @@ bool object_system::remove_vessel(entity_id oid) {
return false; return false;
} }
bool object_system::add_vessel(vessel_entity dpoint) { bool object_system::add_vessel(vessel_entity vessel) {
bool exists = false; bool exists = false;
this->get_dpoint(dpoint.id(), exists); this->get_vessel(vessel.id(), exists);
if (!exists) { if (!exists) {
this->_vessels.push_back(dpoint); this->_vessels.push_back(vessel);
return true; return true;
} }

7
sea_transport/usereditdialog.cpp
View file

@ -24,6 +24,7 @@ void UserEditDialog::set_user(user_entity* user, bool edit) {
ui->et_login->setText(user->login()); ui->et_login->setText(user->login());
ui->et_password->setText("##########UNEDITED##########"); ui->et_password->setText("##########UNEDITED##########");
ui->cb_role->setCurrentIndex((int)user->role()); ui->cb_role->setCurrentIndex((int)user->role());
ui->cb_role->setEnabled(false);
} }
else { else {
this->_user_data = new user_data_struct{}; this->_user_data = new user_data_struct{};
@ -46,8 +47,7 @@ void UserEditDialog::accept() {
} }
bool emptyTitle = ui->et_login->text().trimmed().isEmpty(); bool emptyTitle = ui->et_login->text().trimmed().isEmpty();
bool emptyPassword = ui->et_password->text().trimmed().isEmpty(); bool emptyPassword = ui->et_password->text().trimmed().isEmpty();
bool lowerank = this->_user_data->edit && this->_user_data->role < role; if (emptyTitle || emptyPassword) {
if (emptyTitle || emptyPassword || lowerank) {
QMessageBox errDlg(this); QMessageBox errDlg(this);
errDlg.setTextFormat(Qt::RichText); errDlg.setTextFormat(Qt::RichText);
errDlg.setWindowTitle(tr("Error")); errDlg.setWindowTitle(tr("Error"));
@ -59,9 +59,6 @@ void UserEditDialog::accept() {
if (emptyPassword) { if (emptyPassword) {
message.append("<br>- Password cannot be empty (all spaces - empty too)"); message.append("<br>- Password cannot be empty (all spaces - empty too)");
} }
if (lowerank) {
message.append("<br>- You cannot lower users rank");
}
errDlg.setText(message); errDlg.setText(message);
errDlg.exec(); errDlg.exec();
return; return;