Thread: [fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
From: <gi...@ir...> - 2011-06-27 21:23:51
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Firewall Builder GUI and Policy Compilers Open Source Code". The branch, development has been updated via 64a8a7a9e2cfa5e35c6a8745552575682fce15b0 (commit) from 780ae6b0af21a038ce20599fe29a7d970df2c309 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 64a8a7a9e2cfa5e35c6a8745552575682fce15b0 Author: Theron Tock <th...@ne...> Date: Mon Jun 27 14:22:52 2011 -0700 Don't allow user to create duplicate subfolders. diff --git a/src/libgui/ObjectManipulator_ops.cpp b/src/libgui/ObjectManipulator_ops.cpp index 5221e36..da3552a 100644 --- a/src/libgui/ObjectManipulator_ops.cpp +++ b/src/libgui/ObjectManipulator_ops.cpp @@ -759,6 +759,11 @@ void ObjectManipulator::addSubfolderSlot() tr("Enter new subfolder name")); folder = folder.simplified(); if (folder.isEmpty()) return; + + /* See if the subfolder already exists */ + set<string> folders = stringToSet(obj->getStr("subfolders")); + if (folders.find(folder.toUtf8().constData()) != folders.end()) return; + if (fwbdebug) { qDebug() << "ObjectManipulator::addSubfolder: " << folder; } @@ -766,12 +771,7 @@ void ObjectManipulator::addSubfolderSlot() FWCmdAddUserFolder *cmd = new FWCmdAddUserFolder(m_project, obj, folder, tr("Add subfolder")); FWObject *newObj = cmd->getNewState(); - - set<string> folders = stringToSet(newObj->getStr("subfolders")); - folders.insert(folder.toUtf8().constData()); - string encoded = setToString(folders); - - newObj->setStr("subfolders", encoded); + newObj->setStr("subfolders", setToString(folders)); m_project->undoStack->push(cmd); } ----------------------------------------------------------------------- Summary of changes: src/libgui/ObjectManipulator_ops.cpp | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- Firewall Builder GUI and Policy Compilers Open Source Code |