From 42cfddd34f109e3b9b3e82cfc4482bf1e0a9e179 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 19 Jan 2024 15:34:28 +0100
Subject: [PATCH] XWIKI-21815: Can't follow any users - Error saving the
 notification setting

  * Fix condition for watching / unwatching users

(cherry picked from commit 0bd5585f5b7b0045ef197d26f3c5b69a25ee42bf)
---
 .../XWiki/Notifications/Code/NotificationPreferenceService.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
index 33ae1b9764f..f7336f1adb1 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationPreferenceService.xml
@@ -52,7 +52,7 @@
 #elseif ("$!request.target" == 'user')
   #set ($targetDoc = $xwiki.getDocument($targetUser))
   #set ($targetRef = $services.model.resolveDocument($targetUser))
-  #set($isActionAllowed = ($services.security.authorization.hasAccess('admin', $requestedUserDocRef) || $xcontext.userReference.equals($targetRef)))
+  #set($isActionAllowed = ("$!request.action" == 'watchUser' || "$!request.action" == 'unwatchUser' || $services.security.authorization.hasAccess('admin', $requestedUserDocRef) || $xcontext.userReference.equals($targetRef)))
 #end
 #if ("$!request.action" == "" &amp;&amp; $request.method.equalsIgnoreCase('get'))
   This is a technical page for Notifications macro.
-- 
GitLab