From 17a909168f5db1a37ed905e40a2e8107aa27c640 2017-12-20 13:21:01 From: mperrinel Date: 2017-12-20 13:21:01 Subject: [PATCH] Add saveEvent action --- diff --git a/core/src/Catalogue/CatalogueController.cpp b/core/src/Catalogue/CatalogueController.cpp index c4526fb..94bc357 100644 --- a/core/src/Catalogue/CatalogueController.cpp +++ b/core/src/Catalogue/CatalogueController.cpp @@ -270,24 +270,15 @@ void CatalogueController::waitForFinish() void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom, const QString &dbTo) { - auto cataloguesShared = std::list >{}; + // auto cataloguesShared = std::list >{}; auto catalogues = m_CatalogueDao.getCatalogues(dbFrom); + auto events = m_CatalogueDao.getEvents(dbFrom); for (auto catalogue : catalogues) { - cataloguesShared.push_back(std::make_shared(catalogue)); + m_CatalogueDao.copyCatalogue(catalogue, dbTo, true); } - auto eventsShared = std::list >{}; - auto events = m_CatalogueDao.getEvents(dbFrom); for (auto event : events) { - eventsShared.push_back(std::make_shared(event)); - } - - for (auto catalogue : cataloguesShared) { - m_CatalogueDao.copyCatalogue(*catalogue, dbTo, true); - } - - for (auto event : eventsShared) { - m_CatalogueDao.copyEvent(*event, dbTo, true); + m_CatalogueDao.copyEvent(event, dbTo, true); } } @@ -322,7 +313,7 @@ void CatalogueController::CatalogueControllerPrivate::savAllDB() void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr event, bool persist) { - m_CatalogueDao.moveEvent(*event, toSyncRepository(event->getRepository()), true); + m_CatalogueDao.copyEvent(*event, toSyncRepository(event->getRepository()), true); if (persist) { savAllDB(); } @@ -331,7 +322,7 @@ void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr< void CatalogueController::CatalogueControllerPrivate::saveCatalogue( std::shared_ptr catalogue, bool persist) { - m_CatalogueDao.moveCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true); + m_CatalogueDao.copyCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true); if (persist) { savAllDB(); } diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp index de503c2..2165e10 100644 --- a/gui/src/Catalogue/CatalogueEventsWidget.cpp +++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp @@ -315,7 +315,11 @@ void CatalogueEventsWidget::setEventChanges(const std::shared_ptr &even if (hasChanges) { if (ui->treeView->indexWidget(validationIndex) == nullptr) { auto widget = CatalogueExplorerHelper::buildValidationWidget( - ui->treeView, [this, event]() { setEventChanges(event, false); }, + ui->treeView, + [this, event]() { + sqpApp->catalogueController().saveEvent(event); + setEventChanges(event, false); + }, [this, event]() { setEventChanges(event, false); }); ui->treeView->setIndexWidget(validationIndex, widget); }