GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1321:fba51a5eef20

Discard an added event remove it now.

perrinel -

r1321:fba51a5eef20

parent child

Context file:

r1321:fba51a5eef20

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

                  //    void trashEvent(std::shared_ptr<DBEvent> event);
                  //        void restore(std::shared_ptr<DBEvent> event);
                  void saveEvent(std::shared_ptr<DBEvent> event);
-                 void discardEvent(std::shared_ptr<DBEvent> event);
+                 void discardEvent(std::shared_ptr<DBEvent> event, bool &removed);
                  bool eventHasChanges(std::shared_ptr<DBEvent> event) const;
                  // Catalogue

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

                      impl->m_CatalogueDao.updateEvent(eventTemp);
                  }
+             <<<<<<< Upstream, based on feature/CatalogueDevelop2
                  auto uniqueId = impl->eventUniqueKey(event);
                  impl->m_EventKeysWithChanges.insert(uniqueId);
+             =======
+                 // update event parameter
+                 auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
+                     QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
+                 auto workRepositoryPredicate = std::make_shared<ComparaisonPredicate>(
+                     QString{"repository"}, impl->toWorkRepository(event->getRepository()),
+                     ComparaisonOperation::EQUALEQUAL);
+                 auto workPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
+                 workPred->AddRequestPredicate(uniqIdPredicate);
+                 workPred->AddRequestPredicate(workRepositoryPredicate);
+                 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
+                 *event = workEvent;
+             >>>>>>> 575bb1a Discard an added event remove it now.
              }
              void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
                  impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
              }
-             void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event)
+             void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event, bool &removed)
              {
                  auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
                      QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
                  auto syncEvent = impl->m_CatalogueDao.getEvent(syncPred);
-                 impl->m_CatalogueDao.copyEvent(syncEvent, impl->toWorkRepository(event->getRepository()), true);
-                 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
-                 *event = workEvent;
-                 impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+                 if (!syncEvent.getUniqId().isNull()) {
+                     removed = false;
+                     impl->m_CatalogueDao.copyEvent(syncEvent, impl->toWorkRepository(event->getRepository()),
+                                                    true);
+                     auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
+                     *event = workEvent;
+                     impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+                 }
+                 else {
+                     removed = true;
+                     // Since the element wasn't in sync repository. Discard it means remove it
+                     event->setRepository(impl->toWorkRepository(event->getRepository()));
+                     impl->m_CatalogueDao.removeEvent(*event);
+                 }
              }
              bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const

gui/src/Catalogue/CatalogueEventsWidget.cpp +9 -3

                                      setEventChanges(event, false);
                                  },
                                  [this, event]() {
-                                     sqpApp->catalogueController().discardEvent(event);
-                                     setEventChanges(event, false);
-                                     impl->m_Model->refreshEvent(event, true);
+                                     bool removed = false;
+                                     sqpApp->catalogueController().discardEvent(event, removed);
+                                     if (removed) {
+                                         impl->m_Model->removeEvent(event);
+                                     }
+                                     else {
+                                         setEventChanges(event, false);
+                                         impl->m_Model->refreshEvent(event, true);
+                                     }
                                      emitSelection();
                                  });
                              ui->treeView->setIndexWidget(validationIndex, widget);

gui/src/Catalogue/CatalogueInspectorWidget.cpp +1 -1

                  });
                  connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
-                     auto tags = ui->leEventTags->text().split(QRegExp("\\s+"));
+                     auto tags = ui->leEventTags->text().split(QRegExp("\\s+"), QString::SkipEmptyParts);
                      std::list<QString> tagNames;
                      for (auto tag : tags) {
                          tagNames.push_back(tag);

General Comments 0

Write
Preview

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

No TODOs yet

	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