fix: issue2551231 - template.py-HTMLClass::classhelp doesn't merge user defined classes.

It now merges them in. Also fixed same issue in popcal().

Author: rouilj

CHANGES.txt

@@ -124,6 +124,9 @@ Features:
   Rouillard)
 - Use native number type input for Number() and Integer()
   properties. Integer() uses step=1 as well. (John Rouillard)
+- issue2551231 - template.py-HTMLClass::classhelp doesn't merge
+  user defined classes. It now merges them in. Also fixed same
+  issue in popcal(). (John Rouillard)
 
 2024-07-13 2.4.0
 

roundup/cgi/templating.py

@@ -981,10 +981,18 @@ def classhelp(self, properties=None, label=''"(list)", width='500',
                     group, sort, pagesize, filter)
         onclick = "javascript:help_window('%s', '%s', '%s');return false;" % \
                   (help_url, width, height)
-        return ('<a class="classhelp" data-helpurl="%s" '
+
+        if 'class' in html_kwargs:
+            html_classes = ("classhelp %s" %
+                            html_escape(str(html_kwargs["class"]), True))
+            del html_kwargs["class"]
+        else:
+            html_classes = "classhelp"
+
+        return ('<a class="%s" data-helpurl="%s" '
                 'data-width="%s" data-height="%s" href="%s" '
                 'target="_blank" onclick="%s" %s>%s</a>') % (
-                    help_url, width, height,
+                    html_classes, help_url, width, height,
                     help_url, onclick, self.cgi_escape_attrs(**html_kwargs),
                     self._(label))
 
@@ -2446,9 +2454,16 @@ def popcal(self, width=300, height=200, label="(cal)",
             "data-height": height
         }
 
-        return ('<a class="classhelp" %s href="javascript:help_window('
+        if 'class' in html_kwargs:
+            html_classes = ("classhelp %s" %
+                            html_escape(str(html_kwargs["class"]), True))
+            del html_kwargs["class"]
+        else:
+            html_classes = "classhelp"
+
+        return ('<a class="%s" %s href="javascript:help_window('
                 "'%s?@template=calendar&amp;property=%s&amp;form=%s%s', %d, %d)"
-                '">%s</a>' % (self.cgi_escape_attrs(**data_attr),
+                '">%s</a>' % (html_classes, self.cgi_escape_attrs(**data_attr),
                               self._classname, self._name, form, date, width,
                               height, label))