GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1299:7cb3c310ed8d

Fix bug in discard method to handle repository

perrinel -

r1299:7cb3c310ed8d

parent child

Context file:

r1299:7cb3c310ed8d

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

                 auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
                     QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
-                auto repositoryPredicate = std::make_shared<ComparaisonPredicate>(
+                auto syncRepositoryPredicate = std::make_shared<ComparaisonPredicate>(
                     QString{"repository"}, impl->toSyncRepository(event->getRepository()),
                     ComparaisonOperation::EQUALEQUAL);
-                auto compCompoundPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
+                auto syncPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
-                compCompoundPred->AddRequestPredicate(uniqIdPredicate);
+                syncPred->AddRequestPredicate(uniqIdPredicate);
-                compCompoundPred->AddRequestPredicate(repositoryPredicate);
+                syncPred->AddRequestPredicate(syncRepositoryPredicate);
-                auto syncEvent = impl->m_CatalogueDao.getEvent(compCompoundPred);
+                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 syncEvent = impl->m_CatalogueDao.getEvent(syncPred);
                 impl->m_CatalogueDao.copyEvent(syncEvent, impl->toWorkRepository(event->getRepository()), true);
-                *event = syncEvent;
+                auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
+                *event = workEvent;
                 impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
             }

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