Ticket #925: patch-customlabelwiki-r1049.diff

trac/Milestone.py

@@ -208 +208 @@
             cursor.execute("SELECT DISTINCT owner AS name FROM ticket "
                            "ORDER BY owner")
         elif by not in Ticket.std_fields:
-            fields = get_custom_fields(self.env)
+            fields = get_custom_fields(self.req.hdf, self.env, self.db)
             field = [f for f in fields if f['name'] == by]
             if not field:
                 return []
@@ -308 +308 @@
 
         available_groups = [ 'component', 'version', 'severity', 'priority',
                              'owner' ]
-        available_groups += [f['name'] for f in get_custom_fields(self.env)
+        available_groups += [f['name'] for f in get_custom_fields(self.req.hdf, self.env, self.db)
                              if f['type'] == 'select' or f['type'] == 'radio']
         add_to_hdf(available_groups, self.req.hdf,
                    'milestone.stats.available_groups')

trac/Query.py

@@ -25 +25 @@
 import perm
 import util
 from Module import Module
-from Ticket import get_custom_fields, insert_custom_fields, Ticket
+from Ticket import get_custom_fields, Ticket
 
 
 class QueryModule(Module):
@@ -33 +33 @@
 
     def get_constraints(self):
         constraints = {}
-        custom_fields = [f['name'] for f in get_custom_fields(self.env)]
+        custom_fields = [f['name'] for f in get_custom_fields(self.req.hdf, self.env, self.db)]
         constrained_fields = [k for k in self.args.keys()
                               if k in Ticket.std_fields or k in custom_fields]
         for field in constrained_fields:
@@ -127 +127 @@
         add_options('severity', constraints, 'query.options.', cursor,
                     "SELECT name FROM enum WHERE type='severity' ORDER BY value")
 
-        custom_fields = get_custom_fields(self.env)
+        custom_fields = get_custom_fields(self.req.hdf, self.env, self.db)
         for custom in custom_fields:
             if custom['type'] == 'select' or custom['type'] == 'radio':
                 check = constraints.has_key(custom['name'])
@@ -167 +167 @@
 
         sql = []
         sql.append("SELECT " + ", ".join(headers))
-        custom_fields = [f['name'] for f in get_custom_fields(self.env)]
+        custom_fields = [f['name'] for f in get_custom_fields(self.req.hdf, self.env, self.db)]
         for k in [k for k in constraints.keys() if k in custom_fields]:
             sql.append(", %s.value AS %s" % (k, k))
         sql.append(" FROM ticket")

trac/Ticket.py

@@ -28 +28 @@
 import perm
 import util
 from Module import Module
-from WikiFormatter import wiki_to_html
+from WikiFormatter import wiki_to_html, wiki_to_oneliner
 from Notify import TicketNotifyEmail
 
 __all__ = ['Ticket', 'NewticketModule', 'TicketModule']
@@ -207 +207 @@
         else:
             return 0
 
-def get_custom_fields(env):
+def get_custom_fields(hdf, env, db):
     cfg = env.get_config_items('ticket-custom')
     if not cfg:
         return []
@@ -223 +223 @@
             'name': name,
             'type': items[name],
             'order': items.get(name + '.order', '0'),
-            'label': items.get(name + '.label', ''),
+            'label': wiki_to_oneliner(items.get(name + '.label', ''), hdf, env, db),
             'value': items.get(name + '.value', '')
         }
         if field['type'] == 'select' or field['type'] == 'radio':
@@ -237 +237 @@
     return fields
 
 
-def insert_custom_fields(env, hdf, vals = {}):
-    fields = get_custom_fields(env)
+def insert_custom_fields(hdf, env, db, vals = {}):
+    fields = get_custom_fields(hdf, env, db)
     i = 0
     for f in fields:
         name = f['name']
@@ -328 +328 @@
         util.sql_to_hdf(self.db, 'SELECT name FROM version ORDER BY name',
                         self.req.hdf, 'newticket.versions')
 
-        insert_custom_fields(self.env, self.req.hdf, ticket)
+        insert_custom_fields(self.req.hdf, self.env, self.db, ticket)
 
 
 class TicketModule (Module):
@@ -423 +423 @@
                 hdf.setValue('ticket.changes.%d.new' % idx, util.escape(new))
             idx = idx + 1
 
-        insert_custom_fields(self.env, hdf, ticket)
+        insert_custom_fields(hdf, self.env, self.db, ticket)
         # List attached files
         self.env.get_attachments_hdf(self.db, 'ticket', str(id), self.req.hdf,
                                      'ticket.attachments')