diff options
author | Rémi Nicole <nicole@kolabsystems.com> | 2018-05-14 11:11:46 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-14 11:11:51 +0200 |
commit | d135fa0387672c10bad70b44867470affe1a3232 (patch) | |
tree | edef34603b1ed684ed4cbcc1cbd6dc5fafb59b2d /examples/webdavcommon/webdav.cpp | |
parent | 837509658df9e0827348dd905552160181932f13 (diff) | |
download | sink-d135fa0387672c10bad70b44867470affe1a3232.tar.gz sink-d135fa0387672c10bad70b44867470affe1a3232.zip |
Fix CalDAV test in Docker + add Calendar and Todo in the database layout
Summary:
Like the title says.
Also removed a "/" that got doubled between the collection URI and the item path, because it made Cyrus freak out (returning unauthorized errors)
Reviewers: cmollekopf
Tags: #sink
Differential Revision: https://phabricator.kde.org/D12755
Diffstat (limited to 'examples/webdavcommon/webdav.cpp')
-rw-r--r-- | examples/webdavcommon/webdav.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/webdavcommon/webdav.cpp b/examples/webdavcommon/webdav.cpp index e5f4fab..e13d121 100644 --- a/examples/webdavcommon/webdav.cpp +++ b/examples/webdavcommon/webdav.cpp | |||
@@ -295,14 +295,13 @@ KDAV2::DavUrl WebDavSynchronizer::urlOf(const QByteArray &remoteId) | |||
295 | auto davurl = serverUrl(); | 295 | auto davurl = serverUrl(); |
296 | auto url = davurl.url(); | 296 | auto url = davurl.url(); |
297 | url.setPath(remoteId); | 297 | url.setPath(remoteId); |
298 | SinkLog() << "Returning URL:" << url.toEncoded(); | ||
299 | davurl.setUrl(url); | 298 | davurl.setUrl(url); |
300 | return davurl; | 299 | return davurl; |
301 | } | 300 | } |
302 | 301 | ||
303 | KDAV2::DavUrl WebDavSynchronizer::urlOf(const QByteArray &collectionRemoteId, const QString &itemPath) | 302 | KDAV2::DavUrl WebDavSynchronizer::urlOf(const QByteArray &collectionRemoteId, const QString &itemPath) |
304 | { | 303 | { |
305 | return urlOf(collectionRemoteId + "/" + itemPath.toUtf8()); | 304 | return urlOf(collectionRemoteId + itemPath.toUtf8()); |
306 | } | 305 | } |
307 | 306 | ||
308 | bool WebDavSynchronizer::unchanged(const KDAV2::DavCollection &collection) | 307 | bool WebDavSynchronizer::unchanged(const KDAV2::DavCollection &collection) |