From 0dab9e1eb2a99d9ef8366bf653f6fd5436aa8161 Mon Sep 17 00:00:00 2001
From: Andrew nuark G <mrcluster@ya.ru>
Date: Wed, 23 Dec 2020 19:21:23 +0700
Subject: [PATCH] Post done fixes

---
 sea_transport/system/object_system.cpp | 6 +++---
 sea_transport/usereditdialog.cpp       | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sea_transport/system/object_system.cpp b/sea_transport/system/object_system.cpp
index 5915b78..1a94dcb 100644
--- a/sea_transport/system/object_system.cpp
+++ b/sea_transport/system/object_system.cpp
@@ -66,11 +66,11 @@ bool object_system::remove_vessel(entity_id oid) {
     return false;
 }
 
-bool object_system::add_vessel(vessel_entity dpoint) {
+bool object_system::add_vessel(vessel_entity vessel) {
     bool exists = false;
-    this->get_dpoint(dpoint.id(), exists);
+    this->get_vessel(vessel.id(), exists);
     if (!exists) {
-        this->_vessels.push_back(dpoint);
+        this->_vessels.push_back(vessel);
         return true;
     }
 
diff --git a/sea_transport/usereditdialog.cpp b/sea_transport/usereditdialog.cpp
index 3954ff9..3239ffe 100644
--- a/sea_transport/usereditdialog.cpp
+++ b/sea_transport/usereditdialog.cpp
@@ -24,6 +24,7 @@ void UserEditDialog::set_user(user_entity* user, bool edit) {
         ui->et_login->setText(user->login());
         ui->et_password->setText("##########UNEDITED##########");
         ui->cb_role->setCurrentIndex((int)user->role());
+        ui->cb_role->setEnabled(false);
     }
     else {
         this->_user_data = new user_data_struct{};
@@ -46,8 +47,7 @@ void UserEditDialog::accept() {
     }
     bool emptyTitle = ui->et_login->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 || lowerank) {
+    if (emptyTitle || emptyPassword) {
         QMessageBox errDlg(this);
         errDlg.setTextFormat(Qt::RichText);
         errDlg.setWindowTitle(tr("Error"));
@@ -59,9 +59,6 @@ void UserEditDialog::accept() {
         if (emptyPassword) {
             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.exec();
         return;