fix: Edit account comment bug.
This commit is contained in:
@@ -51,6 +51,7 @@ AccountFormDialog::AccountFormDialog(QWidget* parent, AccountEditMode mode, Qt::
|
||||
|
||||
mLeUserName->setValidator(new QRegExpValidator(QRegExp("^[A-Za-z0-9\u4e00-\u9fa5]+$"), mLeUserName));
|
||||
connect(mLeComment, &QLineEdit::textChanged, [=](const QString& text) {
|
||||
mNewComment = text;
|
||||
mCommentChanged = true;
|
||||
});
|
||||
connect(mLeUserName, &QLineEdit::textChanged, [=](const QString& text) {
|
||||
@@ -170,9 +171,10 @@ void AccountFormDialog::addSelfModeUI(QHBoxLayout* hlayout)
|
||||
if (User::Current())
|
||||
{
|
||||
mLeUserCode->setText(User::Current()->getUserCode());
|
||||
mUserPwd = User::Current()->getPassword();
|
||||
mLeComment->setText(User::Current()->getComment());
|
||||
mLeUserName->setText(User::Current()->getUserName());
|
||||
mUserID = User::Current()->getUserID();
|
||||
mUserPwd = User::Current()->getPassword();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -207,21 +209,25 @@ bool AccountFormDialog::updateReferenceData()
|
||||
if (mMode == Self)
|
||||
{
|
||||
if (!this->mUserNameChanged && !this->mCommentChanged) return true;
|
||||
if (!this->mUserNameChanged)
|
||||
if (this->mUserNameChanged)
|
||||
{
|
||||
if (mNewUserName.isEmpty())
|
||||
{
|
||||
warn(tr("User Name can't be empty!"));
|
||||
return false;
|
||||
}
|
||||
User::Current()->setUserName(mNewUserName);
|
||||
}
|
||||
if (this->mCommentChanged)
|
||||
{
|
||||
User::Current()->setComment(mNewComment);
|
||||
}
|
||||
QString oldUserName = User::Current()->getUserName();
|
||||
User::Current()->setUserName(mNewUserName);
|
||||
bool ret = User::Current()->submitChange();
|
||||
if (ret)
|
||||
{
|
||||
hideWarn();
|
||||
EventCenter::Default()->triggerEvent(CurrentUserNameChanged, nullptr, nullptr);
|
||||
EventCenter::Default()->triggerEvent(CurrentUserInfoChanged, nullptr, nullptr);
|
||||
LOG_USER_OPERATION(QString("Change User Name from %1 to %2").arg(oldUserName).arg(mNewUserName))
|
||||
}
|
||||
else
|
||||
@@ -247,7 +253,7 @@ bool AccountFormDialog::updateReferenceData()
|
||||
user.setUserName(mNewUserName);
|
||||
}
|
||||
if (this->mRoleChanged) user.setRoleID(mRoleID);
|
||||
if (!this->mCommentChanged) user.setComment(mLeComment->text());
|
||||
if (this->mCommentChanged) user.setComment(mLeComment->text());
|
||||
bool ret = user.submitChange();
|
||||
if (ret)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user