GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1280:17a909168f5d

Add saveEvent action

perrinel -

r1280:17a909168f5d

parent child

Context file:

r1280:17a909168f5d

core/src/Catalogue/CatalogueController.cpp +6 -15

             void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                              const QString &dbTo)
             {
-                auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
+                //    auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
                 auto catalogues = m_CatalogueDao.getCatalogues(dbFrom);
+                auto events = m_CatalogueDao.getEvents(dbFrom);
                 for (auto catalogue : catalogues) {
-                    cataloguesShared.push_back(std::make_shared<DBCatalogue>(catalogue));
+                    m_CatalogueDao.copyCatalogue(catalogue, dbTo, true);
                 }
-                auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
-                auto events = m_CatalogueDao.getEvents(dbFrom);
                 for (auto event : events) {
-                    eventsShared.push_back(std::make_shared<DBEvent>(event));
+                    m_CatalogueDao.copyEvent(event, dbTo, true);
-                for (auto catalogue : cataloguesShared) {
-                    m_CatalogueDao.copyCatalogue(*catalogue, dbTo, true);
-                for (auto event : eventsShared) {
-                    m_CatalogueDao.copyEvent(*event, dbTo, true);
                 }
             }
             void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr<DBEvent> event,
                                                                             bool persist)
             {
-                m_CatalogueDao.moveEvent(*event, toSyncRepository(event->getRepository()), true);
+                m_CatalogueDao.copyEvent(*event, toSyncRepository(event->getRepository()), true);
                 if (persist) {
                     savAllDB();
                 }
             void CatalogueController::CatalogueControllerPrivate::saveCatalogue(
                 std::shared_ptr<DBCatalogue> catalogue, bool persist)
             {
-                m_CatalogueDao.moveCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true);
+                m_CatalogueDao.copyCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true);
                 if (persist) {
                     savAllDB();
                 }

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

                 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);
                     }

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