XWIKI-21776: Admin section: make the Notifications section pass webst…

…andard tests (#2801) * Added a fallback for null value of `$divData` * Added a label for the `id="since"` input at the end of the form * Added a missing space between attributes in email preferences * Replaced the comment with an actual test for Notifications * Replaced other uses of Divdata to account for the fact that it might be null
xwiki · Feb 23, 2024 · a0174ab · a0174ab
1 parent 9b1251a
commit a0174ab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...rnate-ui/src/main/resources/XWiki/Notifications/Code/LegacyNotificationAdministration.xml b/...rnate-ui/src/main/resources/XWiki/Notifications/Code/LegacyNotificationAdministration.xml
@@ -67,6 +67,7 @@ $services.localization.use('document', 'XWiki.Notifications.Code.LegacyNotificat
   &lt;div&gt;
     &lt;input type="radio" id="mode_since" name="mode" value="since"#if($request.mode == 'since')checked#end/&gt;
     &lt;label for="mode_since"&gt;$escapetool.html($services.localization.render('legacy.event.migration.since'))&lt;/label&gt;
+    &lt;label for="since" class="sr-only"&gt;$escapetool.html($services.localization.render('legacy.event.migration.since.picker.label'))&lt;/label&gt;
     &lt;input type="date" id="since" name="since"#if($request.since) value="$escapetool.xml($request.since)"#end max="$datetool.format('yyyy-MM-dd', $datetool.date)"/&gt;
   &lt;/div&gt;
   &lt;div class="buttons"&gt;&lt;span class="buttonwrapper"&gt;&lt;input type="submit" value="$escapetool.xml($services.localization.render('legacy.event.migration.start'))" name="migrate" class="button"/&gt;&lt;/span&gt;&lt;/div&gt;

diff --git a/...src/main/resources/XWiki/Notifications/Code/NotificationsApplicationsPreferencesMacro.xml b/...src/main/resources/XWiki/Notifications/Code/NotificationsApplicationsPreferencesMacro.xml
@@ -991,7 +991,7 @@ require(['jquery', 'xwiki-meta', 'ApplicationWidget', 'xwiki-bootstrap-switch',
 {{html clean="false"}}
 &lt;div class="xform"&gt;
 &lt;p class="xHint"&gt;$escapetool.xml($services.localization.render('notifications.settings.applications.hint'))&lt;/p&gt;
-&lt;table class="notifPreferences" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData&gt;
+&lt;table class="notifPreferences" data-target="$escapetool.xml($wikimacro.parameters.target)" $!divData&gt;
   &lt;thead&gt;
     &lt;tr&gt;
       &lt;th scope="col"&gt;$escapetool.xml($services.localization.render('notifications.settings.applications.appName'))&lt;/th&gt;

diff --git a/...ons-ui/src/main/resources/XWiki/Notifications/Code/NotificationsEmailPreferencesMacro.xml b/...ons-ui/src/main/resources/XWiki/Notifications/Code/NotificationsEmailPreferencesMacro.xml
@@ -442,7 +442,7 @@
       &lt;div class="xform"&gt;
         &lt;dl&gt;
           &lt;dt&gt;&lt;label for='preference_notification_email_frequency'&gt;$escapetool.xml($services.localization.render('notifications.settings.email.frequency'))&lt;/label&gt;
-            &lt;p id='preference_notification_email_frequency_hint'class="xHint"&gt;$escapetool.xml($services.localization.render('notifications.settings.email.frequency.hint'))&lt;/p&gt;
+            &lt;p id='preference_notification_email_frequency_hint' class="xHint"&gt;$escapetool.xml($services.localization.render('notifications.settings.email.frequency.hint'))&lt;/p&gt;
           &lt;/dt&gt;
           &lt;dd&gt;
             #if ($wikimacro.parameters.target == 'user')

diff --git a/...rc/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml b/...rc/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
@@ -590,7 +590,7 @@ path=$services.webjars.url('org.xwiki.platform:xwiki-platform-notifications-webj
 ### MACRO CONTENT
 ######################################################
 {{html clean="false"}}
-&lt;div class="systemFilterPreferences xform" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData&gt;
+&lt;div class="systemFilterPreferences xform" data-target="$escapetool.xml($wikimacro.parameters.target)" $!divData&gt;
   &lt;div class="row"&gt;
     &lt;p class="xHint col-xs-12 col-sm-9 col-md-8 col-lg-9"&gt;
       $escapetool.xml($services.localization.render('notifications.settings.filters.preferences.system.hint'))

diff --git a/...bution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/...bution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -298,8 +298,7 @@
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Likes
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Mentions
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=MessageStream
-                <!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Notifications
-                  TODO https://jira.xwiki.org/browse/XWIKI-21776 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Notifications
                 <!-- Wikis -->
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=wikis.descriptor
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=wikis.templates