mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Откл-е запр-в на EditorTrainees EditorInstructors
This commit is contained in:
@@ -70,6 +70,8 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru
|
||||
|
||||
ui->btnSave->setEnabled(false);
|
||||
flSettingsServerChanged = false;
|
||||
|
||||
connect(connectorToServer, &ConnectorToServer::sigTryBlockResult, this, &DialogSettings::slot_checkTryBlockResult);
|
||||
}
|
||||
|
||||
DialogSettings::~DialogSettings()
|
||||
@@ -219,9 +221,6 @@ void DialogSettings::on_btnSetVersion_clicked()
|
||||
flTryVersionControl = true;
|
||||
|
||||
connectorToServer->sendQueryBlockAuth(true, "VersionControl");
|
||||
|
||||
//TODO пока сразу
|
||||
//slot_VersionControl();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -254,7 +253,7 @@ void DialogSettings::on_DialogSettings_accepted()
|
||||
emit signal_LanguageChanged(language);
|
||||
}
|
||||
|
||||
void DialogSettings::slot_VersionControl()
|
||||
void DialogSettings::dialog_VersionControl()
|
||||
{
|
||||
dlgVersionControl = new DialogVersionControl(connectorToServer, this);
|
||||
dlgVersionControl->initialize(connectorToServer->getLoginName());
|
||||
@@ -277,7 +276,7 @@ void DialogSettings::slot_checkTryBlockResult(bool result, QString type)
|
||||
{
|
||||
if(result)
|
||||
{//Одобрено
|
||||
slot_VersionControl();
|
||||
dialog_VersionControl();
|
||||
}
|
||||
else
|
||||
{//Отказ
|
||||
|
||||
@@ -47,12 +47,11 @@ private slots:
|
||||
void on_DialogSettings_accepted();
|
||||
|
||||
public slots:
|
||||
void slot_VersionControl();
|
||||
|
||||
void slot_checkTryBlockResult(bool result, QString type);
|
||||
|
||||
private:
|
||||
bool saveSettings();
|
||||
void dialog_VersionControl();
|
||||
|
||||
private:
|
||||
Ui::DialogSettings *ui;
|
||||
|
||||
Reference in New Issue
Block a user