Changeset 113

Timestamp:

11/13/06 16:12:39 (2 years ago)

Author:

lazaridis_com

Message:

reverting r112

Location:

infra/trac-dev/trac/ticket

Files:

• api.py (modified) (4 diffs)
• query.py (modified) (1 diff)

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

@@ -2 +2 @@
 #
 # Copyright (C) 2003-2006 Edgewall Software
-# Copyright (C) 2003-2005 Jonas Borgström <jonas@edgewall.com>
+# Copyright (C) 2003-2005 Jonas Borgstrm <jonas@edgewall.com>
 # All rights reserved.
 #
@@ -13 +13 @@
 # history and logs, available at http://trac.edgewall.org/log/.
 #
-# Author: Jonas Borgström <jonas@edgewall.com>
+# Author: Jonas Borgstrm <jonas@edgewall.com>
 
 import re
@@ -86 +86 @@
                 if action not in perms or perm_.has_permission(perms[action])]
 
-    def get_ticket_fields(self):
-        """Returns the list of fields available for tickets."""
+    def get_ticket_fields(self, all_fields=False):
+        """Returns the list of fields available for tickets.
+        optional Bool parameter 'all_fields':
+          True:  return all available fields
+          False: return only fields for display within Ticket GUI (default)"""
         from trac.ticket import model
 
@@ -142 +145 @@
             field = {'name': name, 'type': 'text', 'label': name.title()}
             fields.append(field)
+
+        # DateTime fields
+        if (all_fields):
+            fields.append( {'name': 'time', 'type': 'datetime', 'label': 'Created'} )
+            fields.append( {'name': 'changetime', 'type': 'datetime', 'label': 'Modified'} )               
 
         for field in self.get_custom_fields():

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

@@ -54 +54 @@
         self.fields = TicketSystem(self.env).get_ticket_fields(True)
         self.cols = [] # lazily initialized
-        
-        # DateTime fields
-        #TODO: should be moved to get_ticket_fields TicketSystem within api.py
-        self.fields.append( {'name': 'time', 'type': 'datetime', 'label': 'Created'} )
-        self.fields.append( {'name': 'changetime', 'type': 'datetime', 'label': 'Modified'} )         
 
         if self.order != 'id' \