Merge 692d12d into b8784a8

nextcloud · Sep 19, 2016 · 4a4df55 · 4a4df55
2 parents b8784a8 + 692d12d
commit 4a4df55
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/controller/viewcontroller.php b/controller/viewcontroller.php
@@ -65,10 +65,10 @@ public function __construct($appName, IRequest $request,
 	 */
 	public function index() {
 		$runningOn = $this->config->getSystemValue('version');
-		$runningOnServer91OrLater = version_compare($runningOn, '9.1', '>=');
+		$runningOnNextcloud10OrLater = version_compare($runningOn, '9.1', '>=');
 
-		$supportsClass = $runningOnServer91OrLater;
-		$assetPipelineBroken = !$runningOnServer91OrLater;
+		$supportsClass = $runningOnNextcloud10OrLater;
+		$assetPipelineBroken = !$runningOnNextcloud10OrLater;
 
 		$isAssetPipelineEnabled = $this->config->getSystemValue('asset-pipeline.enabled', false);
 		if ($isAssetPipelineEnabled && $assetPipelineBroken) {
@@ -84,6 +84,8 @@ public function index() {
 		$skipPopover = $this->config->getUserValue($userId, $this->appName, 'skipPopover', 'no');
 		$weekNumbers = $this->config->getUserValue($userId, $this->appName, 'showWeekNr', 'no');
 		$defaultColor = $this->config->getAppValue('theming', 'color', '#0082C9');
+
+		$webCalWorkaround = $runningOnNextcloud10OrLater ? 'no' : 'yes';
 
 		return new TemplateResponse('calendar', 'main', [
 			'appVersion' => $appVersion,
@@ -93,6 +95,7 @@ public function index() {
 			'weekNumbers' => $weekNumbers,
 			'supportsClass' => $supportsClass,
 			'defaultColor' => $defaultColor,
+			'webCalWorkaround' => $webCalWorkaround,
 		]);
 	}
 

diff --git a/js/app/service/calendarservice.js b/js/app/service/calendarservice.js
@@ -245,6 +245,8 @@ app.service('CalendarService', function(DavClient, StringUtility, XMLUtility, Ca
 			});
 		}
 
+		const needsWorkaround = angular.element('#fullcalendar').attr('data-webCalWorkaround') === 'yes';
+
 		const [skeleton, dPropChildren] = XMLUtility.getRootSkeleton('d:mkcol', 'd:set', 'd:prop');
 		dPropChildren.push({
 			name: 'd:resourcetype',
@@ -285,7 +287,18 @@ app.service('CalendarService', function(DavClient, StringUtility, XMLUtility, Ca
 		return DavClient.request('MKCOL', url, headers, xml).then(function(response) {
 			if (response.status === 201) {
 				self._takenUrls.push(url);
-				return self.get(url);
+
+				return self.get(url).then(function(webcal) {
+					if (needsWorkaround) {
+						webcal.enabled = true;
+						webcal.displayname = name;
+						webcal.color = color;
+
+						return self.update(webcal);
+					} else {
+						return webcal;
+					}
+				});
 			}
 		});
 	};

diff --git a/templates/part.fullcalendar.php b/templates/part.fullcalendar.php
@@ -30,6 +30,7 @@ class="calendar"
 	data-emailAddress="<?php p($_['emailAddress']); ?>"
 	data-skipPopover="<?php p($_['skipPopover']); ?>"
 	data-weekNumbers="<?php p($_['weekNumbers']); ?>"
+	data-webCalWorkaround="<?php p($_['webCalWorkaround']); ?>"
 	fc
 	id="fullcalendar">
 </div>
diff --git a/tests/unit/controller/viewcontrollerTest.php b/tests/unit/controller/viewcontrollerTest.php
@@ -86,7 +86,7 @@ public function setUp() {
 	/**
 	 * @dataProvider indexDataProvider
 	 */
-	public function testIndex($isAssetPipelineEnabled, $showAssetPipelineError, $serverVersion, $expectsSupportsClass) {
+	public function testIndex($isAssetPipelineEnabled, $showAssetPipelineError, $serverVersion, $expectsSupportsClass, $expectsWebcalWorkaround) {
 		$this->config->expects($this->at(0))
 			->method('getSystemValue')
 			->with('version')
@@ -152,6 +152,7 @@ public function testIndex($isAssetPipelineEnabled, $showAssetPipelineError, $ser
 				'weekNumbers' => 'someShowWeekNrValue',
 				'supportsClass' => $expectsSupportsClass,
 				'defaultColor' => '#ff00ff',
+				'webCalWorkaround' => $expectsWebcalWorkaround
 			], $actual->getParams());
 			$this->assertEquals('main', $actual->getTemplateName());
 		}
@@ -160,10 +161,10 @@ public function testIndex($isAssetPipelineEnabled, $showAssetPipelineError, $ser
 
 	public function indexDataProvider() {
 		return [
-			[true, true, '9.0.5.2', false],
-			[true, false, '9.1.0.0', true],
-			[false, false, '9.0.5.2', false],
-			[false, false, '9.1.0.0', true]
+			[true, true, '9.0.5.2', false, 'yes'],
+			[true, false, '9.1.0.0', true, 'no'],
+			[false, false, '9.0.5.2', false, 'yes'],
+			[false, false, '9.1.0.0', true, 'no']
 		];
 	}