From 9cf9bdc4911054272e1a129b58c5c0e17a17dad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Thu, 1 Nov 2018 20:06:41 +0100
Subject: Load calendars from the server

---
 lib/Service/CollectionsService.php | 12 ++++++------
 lib/Service/SettingsService.php    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/Service/CollectionsService.php b/lib/Service/CollectionsService.php
index ea22317e..6f7ffa80 100644
--- a/lib/Service/CollectionsService.php
+++ b/lib/Service/CollectionsService.php
@@ -48,32 +48,32 @@ class CollectionsService {
 		$collections = array(
 			array(
 				'id' => "starred",
-				'displayname' => (string)$this->l10n->t('Important'),
+				'displayName' => (string)$this->l10n->t('Important'),
 				'show' => 2,
 				'icon' => 'icon-task-star'),
 			array(
 				'id' => "today",
-				'displayname' => (string)$this->l10n->t('Today'),
+				'displayName' => (string)$this->l10n->t('Today'),
 				'show' => 2,
 				'icon' => 'icon-calendar'),
 			array(
 				'id' => "week",
-				'displayname' => (string)$this->l10n->t('Week'),
+				'displayName' => (string)$this->l10n->t('Week'),
 				'show' => 2,
 				'icon' => 'icon-calendar'),
 			array(
 				'id' => "all",
-				'displayname' => (string)$this->l10n->t('All'),
+				'displayName' => (string)$this->l10n->t('All'),
 				'show' => 2,
 				'icon' => 'icon-all'),
 			array(
 				'id' => "current",
-				'displayname' => (string)$this->l10n->t('Current'),
+				'displayName' => (string)$this->l10n->t('Current'),
 				'show' => 2,
 				'icon' => 'icon-current'),
 			array(
 				'id' => "completed",
-				'displayname' => (string)$this->l10n->t('Completed'),
+				'displayName' => (string)$this->l10n->t('Completed'),
 				'show' => 2,
 				'icon' => 'icon-checkmark')
 		);
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 14686f2c..cc27ce26 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -43,7 +43,7 @@ class SettingsService {
 	 */
 	public function get() {
 		$settings = array(
-			'defaultCalendarUri' => (string)$this->settings->getUserValue($this->userId, $this->appName,'various_defaultCalendarUri'),
+			'defaultCalendarId' => (string)$this->settings->getUserValue($this->userId, $this->appName,'various_defaultCalendarId'),
 			'showHidden' => (int)$this->settings->getUserValue($this->userId, $this->appName,'various_showHidden'),
 			'sortOrder' => (string)$this->settings->getUserValue($this->userId, $this->appName,'various_sortOrder'),
 			'sortDirection' => (bool)$this->settings->getUserValue($this->userId, $this->appName,'various_sortDirection'),
-- 
cgit v1.2.3