refs #769, use role bulk to decide if user can directly write models

* renamed role functions
* renamed buttons
* some formatting
This commit is contained in:
Klaus Basan
2016-09-28 04:15:43 +02:00
committed by Mathew Sutcliffe
parent 3a7c9626d3
commit 7446ffcb80
11 changed files with 54 additions and 29 deletions

View File

@@ -98,19 +98,24 @@ namespace BlackMisc
return msgs;
}
bool CAuthenticatedUser::isAdmin() const
bool CAuthenticatedUser::hasAdminRole() const
{
return this->hasRole("ADMIN");
}
bool CAuthenticatedUser::isMappingAdmin() const
bool CAuthenticatedUser::hasMappingAdminRole() const
{
return this->hasRole("MAPPINGADMIN") || this->isAdmin();
return this->hasRole("MAPPINGADMIN");
}
bool CAuthenticatedUser::hasBulkRole() const
{
return this->hasRole("BULK");
}
bool CAuthenticatedUser::canDirectlyWriteModels() const
{
return this->isAdmin() || this->isMappingAdmin();
return this->hasBulkRole();
}
CIcon CAuthenticatedUser::toIcon() const

View File

@@ -129,10 +129,13 @@ namespace BlackMisc
void setCountry(const BlackMisc::CCountry &country) { m_country = country; }
//! Admin?
bool isAdmin() const;
bool hasAdminRole() const;
//! Admin?
bool isMappingAdmin() const;
bool hasMappingAdminRole() const;
//! Has bulk role?
bool hasBulkRole() const;
//! Authenticated
void setAuthenticated(bool authenticated) { m_authenticated = authenticated; }