##// END OF EJS Templates
Rebase fix CatalogueCatalogue
perrinel -
r1323:66e1a8e9fbb1
parent child
Show More
@@ -190,27 +190,14 void CatalogueController::addEvent(std::shared_ptr<DBEvent> event)
190 impl->m_CatalogueDao.updateEvent(eventTemp);
190 impl->m_CatalogueDao.updateEvent(eventTemp);
191 }
191 }
192
192
193 <<<<<<< Upstream, based on feature/CatalogueDevelop2
193 auto workPred = impl->createFinder(event->getUniqId(), event->getRepository(), DBType::WORK);
194 auto uniqueId = impl->eventUniqueKey(event);
195 impl->m_EventKeysWithChanges.insert(uniqueId);
196 =======
197
198 // update event parameter
199 auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
200 QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
201
202 auto workRepositoryPredicate = std::make_shared<ComparaisonPredicate>(
203 QString{"repository"}, impl->toWorkRepository(event->getRepository()),
204 ComparaisonOperation::EQUALEQUAL);
205
206 auto workPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
207 workPred->AddRequestPredicate(uniqIdPredicate);
208 workPred->AddRequestPredicate(workRepositoryPredicate);
209
210
194
211 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
195 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
212 *event = workEvent;
196 *event = workEvent;
213 >>>>>>> 575bb1a Discard an added event remove it now.
197
198
199 auto uniqueId = impl->eventUniqueKey(event);
200 impl->m_EventKeysWithChanges.insert(uniqueId);
214 }
201 }
215
202
216 void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
203 void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
General Comments 0
You need to be logged in to leave comments. Login now