GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1298:85d482a16060

Add discard method for event

perrinel -

r1298:85d482a16060

parent child

Context file:

r1298:85d482a16060

core/include/Catalogue/CatalogueController.h +2 -1

                 void updateEventProduct(std::shared_ptr<DBEventProduct> eventProduct);
                 void removeEvent(std::shared_ptr<DBEvent> event);
                 //    void trashEvent(std::shared_ptr<DBEvent> event);
-                //    void restore(QUuid eventId);
+                //        void restore(std::shared_ptr<DBEvent> event);
                 void saveEvent(std::shared_ptr<DBEvent> event);
+                void discardEvent(std::shared_ptr<DBEvent> event);
                 bool eventHasChanges(std::shared_ptr<DBEvent> event) const;
                 // Catalogue

core/src/Catalogue/CatalogueController.cpp +22 -2

@@ -191,6 +191,26 void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
191	impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));	191	impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
192	}	192	}
193		193
		194	void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event)
		195	{
		196	auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
		197	QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
		198
		199	auto repositoryPredicate = std::make_shared<ComparaisonPredicate>(
		200	QString{"repository"}, impl->toSyncRepository(event->getRepository()),
		201	ComparaisonOperation::EQUALEQUAL);
		202
		203	auto compCompoundPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
		204	compCompoundPred->AddRequestPredicate(uniqIdPredicate);
		205	compCompoundPred->AddRequestPredicate(repositoryPredicate);
		206
		207
		208	auto syncEvent = impl->m_CatalogueDao.getEvent(compCompoundPred);
		209	impl->m_CatalogueDao.copyEvent(syncEvent, impl->toWorkRepository(event->getRepository()), true);
		210	*event = syncEvent;
		211	impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
		212	}
		213
194	bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const	214	bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const
195	{	215	{
196	return impl->m_EventKeysWithChanges.contains(impl->eventUniqueKey(event));	216	return impl->m_EventKeysWithChanges.contains(impl->eventUniqueKey(event));
@@ -297,8 +317,8 CatalogueController::eventsForMimeData(const QByteArray &mimeData) const
297		317
298	void CatalogueController::initialize()	318	void CatalogueController::initialize()
299	{	319	{
300	qCDebug(LOG_CatalogueController())	320	qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
301	<< tr("CatalogueController init") << QThread::currentThread();	321	<< QThread::currentThread();
302		322
303	impl->m_CatalogueDao.initialize();	323	impl->m_CatalogueDao.initialize();
304	auto defaultRepositoryLocation	324	auto defaultRepositoryLocation

gui/src/Catalogue/CatalogueEventsWidget.cpp +5 -1

                                     sqpApp->catalogueController().saveEvent(event);
                                     setEventChanges(event, false);
                                 },
-                                [this, event]() { setEventChanges(event, false); });
+                                [this, event]() {
+                                    sqpApp->catalogueController().discardEvent(event);
+                                    setEventChanges(event, false);
+                                    impl->m_Model->refreshEvent(event);
+                                });
                             ui->treeView->setIndexWidget(validationIndex, widget);
                         }
                     }

gui/src/Catalogue/CatalogueSideBarWidget.cpp +2 -4

                 if (value) {
                     if (!hasChanges(validationIndex, treeView)) {
                         auto widget = CatalogueExplorerHelper::buildValidationWidget(
-                            treeView,
+                            treeView, [this, validationIndex,
-                            [this, validationIndex, treeView]() {
+                                       treeView]() { setHasChanges(false, validationIndex, treeView); },
-                                setHasChanges(false, validationIndex, treeView);
-                            },
                             [this, validationIndex, treeView]() {
                                 setHasChanges(false, validationIndex, treeView);
                             });

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages