| @@ -270,24 +270,15 void CatalogueController::waitForFinish() | |||
|
|
270 | 270 | void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom, |
|
|
271 | 271 | const QString &dbTo) |
|
|
272 | 272 | { |
|
|
273 | auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{}; | |
|
|
273 | // auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{}; | |
|
|
274 | 274 | auto catalogues = m_CatalogueDao.getCatalogues(dbFrom); |
|
|
275 | auto events = m_CatalogueDao.getEvents(dbFrom); | |
|
|
275 | 276 | for (auto catalogue : catalogues) { |
|
|
276 | cataloguesShared.push_back(std::make_shared<DBCatalogue>(catalogue)); | |
|
|
277 | m_CatalogueDao.copyCatalogue(catalogue, dbTo, true); | |
|
|
277 | 278 | } |
|
|
278 | 279 | |
|
|
279 | auto eventsShared = std::list<std::shared_ptr<DBEvent> >{}; | |
|
|
280 | auto events = m_CatalogueDao.getEvents(dbFrom); | |
|
|
281 | 280 | for (auto event : events) { |
|
|
282 | eventsShared.push_back(std::make_shared<DBEvent>(event)); | |
|
|
283 | } | |
|
|
284 | ||
|
|
285 | for (auto catalogue : cataloguesShared) { | |
|
|
286 | m_CatalogueDao.copyCatalogue(*catalogue, dbTo, true); | |
|
|
287 | } | |
|
|
288 | ||
|
|
289 | for (auto event : eventsShared) { | |
|
|
290 | m_CatalogueDao.copyEvent(*event, dbTo, true); | |
|
|
281 | m_CatalogueDao.copyEvent(event, dbTo, true); | |
|
|
291 | 282 | } |
|
|
292 | 283 | } |
|
|
293 | 284 | |
| @@ -322,7 +313,7 void CatalogueController::CatalogueControllerPrivate::savAllDB() | |||
|
|
322 | 313 | void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr<DBEvent> event, |
|
|
323 | 314 | bool persist) |
|
|
324 | 315 | { |
|
|
325 |
m_CatalogueDao. |
|
|
|
316 | m_CatalogueDao.copyEvent(*event, toSyncRepository(event->getRepository()), true); | |
|
|
326 | 317 | if (persist) { |
|
|
327 | 318 | savAllDB(); |
|
|
328 | 319 | } |
| @@ -331,7 +322,7 void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr< | |||
|
|
331 | 322 | void CatalogueController::CatalogueControllerPrivate::saveCatalogue( |
|
|
332 | 323 | std::shared_ptr<DBCatalogue> catalogue, bool persist) |
|
|
333 | 324 | { |
|
|
334 |
m_CatalogueDao. |
|
|
|
325 | m_CatalogueDao.copyCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true); | |
|
|
335 | 326 | if (persist) { |
|
|
336 | 327 | savAllDB(); |
|
|
337 | 328 | } |
| @@ -315,7 +315,11 void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &even | |||
|
|
315 | 315 | if (hasChanges) { |
|
|
316 | 316 | if (ui->treeView->indexWidget(validationIndex) == nullptr) { |
|
|
317 | 317 | auto widget = CatalogueExplorerHelper::buildValidationWidget( |
|
|
318 | ui->treeView, [this, event]() { setEventChanges(event, false); }, | |
|
|
318 | ui->treeView, | |
|
|
319 | [this, event]() { | |
|
|
320 | sqpApp->catalogueController().saveEvent(event); | |
|
|
321 | setEventChanges(event, false); | |
|
|
322 | }, | |
|
|
319 | 323 | [this, event]() { setEventChanges(event, false); }); |
|
|
320 | 324 | ui->treeView->setIndexWidget(validationIndex, widget); |
|
|
321 | 325 | } |
General Comments 0
You need to be logged in to leave comments.
Login now