Merge pull request #397 from tortuetorche/patch-better-onSettingsChan…

…ge-event Better 'onSettingsChange' event handling to get old setting values
nextcloud · Apr 9, 2020 · b232758 · b232758
2 parents 660a931 + b0aa51c
commit b232758
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/Service/CirclesService.php b/lib/Service/CirclesService.php
@@ -318,6 +318,14 @@ public function settingsCircle($circleUniqueId, $settings) {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
 			$this->hasToBeOwner($circle->getHigherViewer());
 
+			$oldSettings = array_merge(
+				$circle->getSettings(),
+				[
+					'circle_name' => $circle->getName(),
+					'circle_desc' => $circle->getDescription(),
+				]
+			);
+
 			if (!$this->viewerIsAdmin()) {
 				$settings['members_limit'] = $circle->getSetting('members_limit');
 			}
@@ -329,7 +337,7 @@ public function settingsCircle($circleUniqueId, $settings) {
 
 			$this->circlesRequest->updateCircle($circle, $this->userId);
 
-			$this->eventsService->onSettingsChange($circle);
+			$this->eventsService->onSettingsChange($circle, $oldSettings);
 		} catch (\Exception $e) {
 			throw $e;
 		}

diff --git a/lib/Service/EventsService.php b/lib/Service/EventsService.php
@@ -747,9 +747,10 @@ public function onLinkRemove(Circle $circle, FederatedLink $link) {
 	 * Called when the circle's settings are changed
 	 *
 	 * @param Circle $circle
+	 * @param array  $oldSettings
 	 */
-	public function onSettingsChange(Circle $circle) {
-		$this->dispatch('\OCA\Circles::onSettingsChange', ['circle' => $circle]);
+	public function onSettingsChange(Circle $circle, array $oldSettings = []) {
+		$this->dispatch('\OCA\Circles::onSettingsChange',  ['circle' => $circle, 'oldSettings' => $oldSettings]);
 	}