mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-15 01:05:35 +08:00
Minor fixes when reporting T141
* user authenticated must be enabled/valid * Read only: BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> * clear user fields when not authenticated
This commit is contained in:
committed by
Mathew Sutcliffe
parent
2dfc56dc39
commit
0dfe6f69fe
@@ -172,7 +172,7 @@ namespace BlackCore
|
|||||||
|
|
||||||
void CDatabaseAuthenticationService::userChanged()
|
void CDatabaseAuthenticationService::userChanged()
|
||||||
{
|
{
|
||||||
// code goes here
|
// this->logoff();
|
||||||
}
|
}
|
||||||
} // ns
|
} // ns
|
||||||
} // ns
|
} // ns
|
||||||
|
|||||||
@@ -155,6 +155,8 @@ namespace BlackGui
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
ui->le_Name->clear();
|
||||||
|
ui->te_Roles->clear();
|
||||||
this->setModeLogin(true);
|
this->setModeLogin(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
QScopedPointer<Ui::CDbLoginComponent> ui;
|
QScopedPointer<Ui::CDbLoginComponent> ui;
|
||||||
BlackCore::Db::CDatabaseAuthenticationService m_loginService {this}; //!< login service
|
BlackCore::Db::CDatabaseAuthenticationService m_loginService { this }; //!< login service
|
||||||
|
|
||||||
//! Overlay messages
|
//! Overlay messages
|
||||||
void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
|
void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
|
||||||
|
|||||||
@@ -135,9 +135,6 @@ namespace BlackGui
|
|||||||
|
|
||||||
// vPilot
|
// vPilot
|
||||||
this->initVPilotLoading();
|
this->initVPilotLoading();
|
||||||
|
|
||||||
// user changes
|
|
||||||
m_swiftDbUser.setNotifySlot(&CDbMappingComponent::ps_userChanged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CDbMappingComponent::~CDbMappingComponent()
|
CDbMappingComponent::~CDbMappingComponent()
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ namespace BlackGui
|
|||||||
QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog; //!< dialog when modifying models
|
QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog; //!< dialog when modifying models
|
||||||
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules
|
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules
|
||||||
BlackMisc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::ps_digestStashedModelsChanged, &CDbMappingComponent::ps_onStashedModelsChangedDigest, 750, 25 };
|
BlackMisc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::ps_digestStashedModelsChanged, &CDbMappingComponent::ps_onStashedModelsChangedDigest, 750, 25 };
|
||||||
BlackMisc::CData<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this };
|
BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this, &CDbMappingComponent::ps_userChanged };
|
||||||
const bool vPilotSupport = true; //!< vPilot support (will be removed in future)
|
const bool vPilotSupport = true; //!< vPilot support (will be removed in future)
|
||||||
bool m_vPilot1stInit = true; //!< vPilot extensions initalized?
|
bool m_vPilot1stInit = true; //!< vPilot extensions initalized?
|
||||||
bool m_vPilotEnabled = false; //!< use vPilot extensions
|
bool m_vPilotEnabled = false; //!< use vPilot extensions
|
||||||
|
|||||||
@@ -117,6 +117,11 @@ namespace BlackMisc
|
|||||||
return this->hasRole("BULKADD");
|
return this->hasRole("BULKADD");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CAuthenticatedUser::isAuthenticated() const
|
||||||
|
{
|
||||||
|
return this->isEnabled() && this->isValid() && m_authenticated;
|
||||||
|
}
|
||||||
|
|
||||||
bool CAuthenticatedUser::canDirectlyWriteModels() const
|
bool CAuthenticatedUser::canDirectlyWriteModels() const
|
||||||
{
|
{
|
||||||
return this->hasBulkRole() || this->hasBulkAddRole();
|
return this->hasBulkRole() || this->hasBulkAddRole();
|
||||||
@@ -131,7 +136,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
if (index.isMyself()) { return CVariant::from(*this); }
|
if (index.isMyself()) { return CVariant::from(*this); }
|
||||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
|
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
|
||||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||||
switch (i)
|
switch (i)
|
||||||
{
|
{
|
||||||
case IndexVatsimId:
|
case IndexVatsimId:
|
||||||
@@ -153,7 +158,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
if (index.isMyself()) { (*this) = variant.to<CAuthenticatedUser>(); return; }
|
if (index.isMyself()) { (*this) = variant.to<CAuthenticatedUser>(); return; }
|
||||||
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant); return; }
|
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant); return; }
|
||||||
ColumnIndex i = index.frontCasted<ColumnIndex>();
|
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||||
switch (i)
|
switch (i)
|
||||||
{
|
{
|
||||||
case IndexVatsimId:
|
case IndexVatsimId:
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ namespace BlackMisc
|
|||||||
void setAuthenticated(bool authenticated) { m_authenticated = authenticated; }
|
void setAuthenticated(bool authenticated) { m_authenticated = authenticated; }
|
||||||
|
|
||||||
//! Authenticated
|
//! Authenticated
|
||||||
bool isAuthenticated() const { return m_authenticated; }
|
bool isAuthenticated() const;
|
||||||
|
|
||||||
//! Enabled
|
//! Enabled
|
||||||
void setEnabled(bool enabled) { m_enabled = enabled; }
|
void setEnabled(bool enabled) { m_enabled = enabled; }
|
||||||
|
|||||||
Reference in New Issue
Block a user