summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-30 18:25:00 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-30 18:25:57 +0200
commit6d7221ade756682bd48b5334fbaef84cefed948a (patch)
treeec1f0dbaf826ede0a17d6d532fe0c00754ce0344
parent9a14a9fff41d628ced31fea188bb5344bc6f48c3 (diff)
downloadkube-6d7221ade756682bd48b5334fbaef84cefed948a.tar.gz
kube-6d7221ade756682bd48b5334fbaef84cefed948a.zip
The resource has been renamed
-rwxr-xr-xdocker/setupkolabnowtest.sh2
-rw-r--r--framework/src/domain/settings/accountsettings.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/setupkolabnowtest.sh b/docker/setupkolabnowtest.sh
index 0438ced2..b0d53281 100755
--- a/docker/setupkolabnowtest.sh
+++ b/docker/setupkolabnowtest.sh
@@ -1,5 +1,5 @@
1sinksh create account type kolabnow identifier kolabnowAccount name KolabnowAccount 1sinksh create account type kolabnow identifier kolabnowAccount name KolabnowAccount
2sinksh create resource type sink.imap identifier kolabnowImap account kolabnowAccount server imaps://imap.kolabnow.com:993 username test1@kolab.org password Welcome2KolabSystems 2sinksh create resource type sink.imap identifier kolabnowImap account kolabnowAccount server imaps://imap.kolabnow.com:993 username test1@kolab.org password Welcome2KolabSystems
3sinksh create resource type sink.mailtransport identifier kolabnowSmtp account kolabnowAccount server smtps://smtp.kolabnow.com:587 username test1@kolab.org password Welcome2KolabSystems 3sinksh create resource type sink.mailtransport identifier kolabnowSmtp account kolabnowAccount server smtps://smtp.kolabnow.com:587 username test1@kolab.org password Welcome2KolabSystems
4sinksh create resource type sink.dav identifier kolabnowDav account kolabnowAccount server https://apps.kolabnow.com/addressbooks/test1%40kolab.org username test1@kolab.org password Welcome2KolabSystems 4sinksh create resource type sink.carddav identifier kolabnowDav account kolabnowAccount server https://apps.kolabnow.com/addressbooks/test1%40kolab.org username test1@kolab.org password Welcome2KolabSystems
5sinksh create identity name "John Doe" address test1@kolab.org account kolabnowAccount 5sinksh create identity name "John Doe" address test1@kolab.org account kolabnowAccount
diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index a75d5e07..9cd41518 100644
--- a/framework/src/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
@@ -242,7 +242,7 @@ void AccountSettings::loadIdentity()
242 242
243void AccountSettings::loadCardDavResource() 243void AccountSettings::loadCardDavResource()
244{ 244{
245 Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).filter<SinkResource::ResourceType>("sink.dav")) 245 Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).filter<SinkResource::ResourceType>("sink.carddav"))
246 .then([this](const SinkResource &resource) { 246 .then([this](const SinkResource &resource) {
247 mCardDavIdentifier = resource.identifier(); 247 mCardDavIdentifier = resource.identifier();
248 mCardDavServer = resource.getProperty("server").toString(); 248 mCardDavServer = resource.getProperty("server").toString();