From cd1c28cd7a1631f99d6a6efa1b74180d82c76cc3 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 3 Aug 2018 10:23:29 +0200
Subject: Cleanup

---
 framework/src/domain/contactcontroller.cpp | 6 +++++-
 views/people/main.qml                      | 5 +++++
 views/people/qml/People.qml                | 2 ++
 views/people/qml/PersonComposer.qml        | 4 +---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/framework/src/domain/contactcontroller.cpp b/framework/src/domain/contactcontroller.cpp
index 0b46b34d..32c6d2a2 100644
--- a/framework/src/domain/contactcontroller.cpp
+++ b/framework/src/domain/contactcontroller.cpp
@@ -104,8 +104,12 @@ void ContactController::updateSaveAction()
 
 void ContactController::loadContact(const QVariant &variant)
 {
+    using namespace Sink;
+
     mContact = variant;
-    if (auto c = variant.value<Sink::ApplicationDomain::Contact::Ptr>()) {
+    if (auto c = variant.value<ApplicationDomain::Contact::Ptr>()) {
+
+        setAddressbook(ApplicationDomainType::Ptr::create(ApplicationDomainType::createEntity<ApplicationDomain::Addressbook>(c->resourceInstanceIdentifier(), c->getAddressbook())));
         const auto &vcard = c->getVcard();
         KContacts::VCardConverter converter;
         const auto addressee = converter.parseVCard(vcard);
diff --git a/views/people/main.qml b/views/people/main.qml
index 0ff35db3..4249c392 100644
--- a/views/people/main.qml
+++ b/views/people/main.qml
@@ -46,6 +46,11 @@ ApplicationWindow {
                 type: "carddav",
             }],
             addressbooks: [{
+                id: "addressbook0",
+                resource: "carddavresource",
+                name: "Addressbook(wrong)"
+            },
+            {
                 id: "addressbook1",
                 resource: "carddavresource",
                 name: "Default Addressbook",
diff --git a/views/people/qml/People.qml b/views/people/qml/People.qml
index ad723427..ccec0ae0 100644
--- a/views/people/qml/People.qml
+++ b/views/people/qml/People.qml
@@ -247,6 +247,8 @@ FocusScope {
                     margins: Kube.Units.largeSpacing
                 }
                 text: qsTr("Edit")
+                //FIXME implement modifications first
+                visible: false
 
                 onClicked: {
                     stack.push(personComposer)
diff --git a/views/people/qml/PersonComposer.qml b/views/people/qml/PersonComposer.qml
index b409c3d6..ff24a456 100644
--- a/views/people/qml/PersonComposer.qml
+++ b/views/people/qml/PersonComposer.qml
@@ -240,9 +240,7 @@ Flickable {
                 model: Kube.EntityModel {
                     id: addressbookModel
                     type: "addressbook"
-                    //TODO
-                    //accountId: ""
-                    roles: ["name", "color"]
+                    roles: ["name"]
                 }
                 textRole: "name"
                 Layout.fillWidth: true
-- 
cgit v1.2.3