From 6fc48ab160f917f5d3a59fa3cd1e0a6d615e1be6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 3 May 2017 03:41:10 +0200 Subject: [PATCH] Ref T53, "bulkadd" role in UI/user --- src/blackgui/components/dbstashcomponent.cpp | 2 +- src/blackmisc/network/authenticateduser.cpp | 7 ++++++- src/blackmisc/network/authenticateduser.h | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index b1bf64eca..c7536bf01 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -477,7 +477,7 @@ namespace BlackGui } else if (user.canDirectlyWriteModels()) { - ui->pb_Publish->setText("Publish (direct)"); + ui->pb_Publish->setText("Publish (dir.)"); ui->pb_Publish->setToolTip("Models directly released"); ui->pb_Publish->setEnabled(true); } diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp index f491ef0b9..144fad362 100644 --- a/src/blackmisc/network/authenticateduser.cpp +++ b/src/blackmisc/network/authenticateduser.cpp @@ -112,9 +112,14 @@ namespace BlackMisc return this->hasRole("BULK"); } + bool CAuthenticatedUser::hasBulkAddRole() const + { + return this->hasRole("BULKADD"); + } + bool CAuthenticatedUser::canDirectlyWriteModels() const { - return this->hasBulkRole(); + return this->hasBulkRole() || this->hasBulkAddRole(); } CIcon CAuthenticatedUser::toIcon() const diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h index c46ee75f6..1a3561003 100644 --- a/src/blackmisc/network/authenticateduser.h +++ b/src/blackmisc/network/authenticateduser.h @@ -137,6 +137,9 @@ namespace BlackMisc //! Has bulk role? bool hasBulkRole() const; + //! Has bulk add role? + bool hasBulkAddRole() const; + //! Authenticated void setAuthenticated(bool authenticated) { m_authenticated = authenticated; }