* Prevent naming properties with reserved words (Fix #16846) * Prevent using reserved constant names for properties or aliases * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * App: Add unit test for isTokenAConstant --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
#include <App/DocumentObject.h>
|
||||
#include <App/ExpressionParser.h>
|
||||
#include <App/PropertyUnits.h>
|
||||
#include <Base/Tools.h>
|
||||
|
||||
@@ -351,6 +352,14 @@ void DlgAddPropertyVarSet::checkName() {
|
||||
throw CreatePropertyException("Invalid name");
|
||||
}
|
||||
|
||||
if(App::ExpressionParser::isTokenAUnit(name) || App::ExpressionParser::isTokenAConstant(name)) {
|
||||
QMessageBox::critical(getMainWindow(),
|
||||
QObject::tr("Invalid name"),
|
||||
QObject::tr("The property name is a reserved word."));
|
||||
clearEditors(!CLEAR_NAME);
|
||||
throw CreatePropertyException("Invalid name");
|
||||
}
|
||||
|
||||
if (namePropertyToAdd.empty()) {
|
||||
// we are adding a new property, check whether it doesn't already exist
|
||||
auto prop = varSet->getPropertyByName(name.c_str());
|
||||
|
||||
Reference in New Issue
Block a user