Changeset 119

Timestamp:

11/14/06 14:13:50 (3 years ago)

Author:

lazaridis_com

Message:

re #62 and #48, avoid influence on query.html, recreating original version

Location:

infra/trac-dev

Files:

• templates/query.html (modified) (2 diffs)
• trac/ticket/query.py (modified) (3 diffs)

infra/trac-dev/templates/query.html

@@ -115 +115 @@
                   <select name="add_filter" id="add_filter">
                     <option></option>
-                    <py:for each="field_name, field in fields.iteritems()" >
-                    <option py:if="field.type != 'datetime'"
+                    <option py:for="field_name, field in fields.iteritems()"
                             value="$field_name"
                             disabled="${(field.type == 'radio' and
@@ -123 +122 @@
                       ${field.label}
                     </option>
-                    </py:for>
                   </select>
                   <input type="submit" name="add" value="+" />

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

@@ -55 +55 @@
         self.cols = [] # lazily initialized
         
-        # Workaround for missing 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' \
                 and self.order not in [f['name'] for f in self.fields]:
@@ -67 +62 @@
         if self.group not in [f['name'] for f in self.fields]:
             self.group = None
+
+        #TODO: remove after adding time/changtime to the api.py
+        if order in ['time', 'changetime']:
+            self.order = order
 
     def from_string(cls, env, req, string, **kw):
@@ -387 +386 @@
         cols = self.get_columns()
         labels = dict([(f['name'], f['label']) for f in self.fields])
+
+        #TODO: remove after adding time/changtime to the api.py
+        labels['changetime'] = 'Modified'
+        labels['time'] = 'Created'
+
         headers = [{
             'name': col, 'label': labels.get(col, 'Ticket'),