From b1ecfb627d202a1591970cf0201593233f811f3f Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Wed, 15 Jan 2020 12:00:01 +0100 Subject: [PATCH] Only emit compatible packages from DiscrepanciesPresenter CURA-6983 --- plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py | 3 ++- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py b/plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py index ecb322f00e..f4ff895b45 100644 --- a/plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py +++ b/plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py @@ -28,6 +28,7 @@ class DiscrepanciesPresenter(QObject): self._dialog.accepted.connect(lambda: self._onConfirmClicked(model)) def _onConfirmClicked(self, model: SubscribedPackagesModel): - # For now, all packages presented to the user should be installed. + # For now, all compatible packages presented to the user should be installed. # Later, we might remove items for which the user unselected the package + model.setItems(model.getCompatiblePackages()) self.packageMutations.emit(model) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 3fd2e34b9a..cea4936655 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -41,6 +41,9 @@ class SubscribedPackagesModel(ListModel): if self._discrepancies != discrepancy: self._discrepancies = discrepancy + def getCompatiblePackages(self): + return [x for x in self._items if x["is_compatible"]] + def update(self): self._items.clear()