Changeset 77

Timestamp:

11/02/06 05:35:09 (2 years ago)

Author:

lazaridis_com

Message:

closes #46, implemented possibility to define multiple query-result-fieldsets (defined within trac.in), called via paramether "fieldset=name"

Files:

• infra/trac-dev/trac/ticket/query.py (modified) (5 diffs)

infra/trac-dev/trac/ticket/query.py

@@ -44 +44 @@
 
     def __init__(self, env, constraints=None, order=None, desc=0, group=None,
-                 groupdesc = 0, verbose=0):
+                 groupdesc = 0, verbose=0, fieldset=None):
         self.env = env
         self.constraints = constraints or {}
@@ -52 +52 @@
         self.groupdesc = groupdesc
         self.verbose = verbose
+        self.fieldset = fieldset
         self.fields = TicketSystem(self.env).get_ticket_fields(True)
         self.cols = [] # lazily initialized
@@ -65 +66 @@
     def from_string(cls, env, req, string, **kw):
         filters = string.split('&')
-        kw_strs = ['order', 'group']
+        kw_strs = ['order', 'group', 'fieldset']
         kw_bools = ['desc', 'groupdesc', 'verbose']
         constraints = {}
@@ -112 +113 @@
         cols += [f['name'] for f in self.fields if f['type'] != 'textarea']
 
-        # user definable default display fields
-        cols = QueryModule(self.env).default_display_fields
-
+        # user defineable query result display fields      
+        fieldsets = QueryModule(self.env).get_fieldsets()
+        if self.fieldset:
+            if fieldsets.has_key(self.fieldset):
+                cols = fieldsets[self.fieldset]
+        else:
+            if fieldsets.has_key('default'):
+                cols = fieldsets['default']
+
+        #TODO: what does this do?
         for col in ('reporter', 'keywords', 'cc'):
             if col in cols:
@@ -439 +447 @@
                IContentConverter)
 
-    # introducing option
-    from trac.config import ListOption
-                   
-    default_display_fields = ListOption('query', 'default_display_fields',
-    'id,summary,status,owner,type,priority,milestone,changetime', doc=
-    """(dev-status: draft) Fields to display in query results
-    possible values:
-    id,summary,status,owner,type,priority,milestone,changetime,time""")               
+    def get_fieldsets(self):
+        """ (dev-status: beta) returns a dictionary of user-defined fieldsets
+        
+        Those fieldsets are defined in trac-ini within the section
+        
+        [ticket-query-fieldsets]        
+        fieldsetname=id,summary,owner,changetime
+        anothersetname=id,summary,time
+        default=id,summary
+        
+        specify a query parameter &fieldset=fieldsetname
+        
+        if fieldset is ommited, the default fieldset is used
+        if default is unspecified, the standard-trac fieldset is used
+        
+        """
+
+        config = self.config['ticket-query-fieldsets']
+        
+        fieldsets = {}
+        for option, value in config.options():
+            fieldsets[option] = config.getlist(option, sep=',')
+
+        return fieldsets           
 
     # IContentConverter methods