Changeset 302 for trunk/plugins/dashboardreportsplugin/dashboardreports/patch/ticket-query.diff

Timestamp:

06/19/08 12:26:50 (5 years ago)

Author:

aculapov

Message:

• patch after 7218 revision

File:

• trunk/plugins/dashboardreportsplugin/dashboardreports/patch/ticket-query.diff (modified) (16 diffs)

trunk/plugins/dashboardreportsplugin/dashboardreports/patch/ticket-query.diff

@@ -1 +1 @@
 Index: trac/ticket/api.py
 ===================================================================
---- trac/ticket/api.py  (revision 7142)
+--- trac/ticket/api.py  (revision 7218)
 +++ trac/ticket/api.py  (working copy)
 @@ -182,6 +182,17 @@
@@ -23 +23 @@
 Index: trac/ticket/query.py
 ===================================================================
---- trac/ticket/query.py        (revision 7142)
+--- trac/ticket/query.py        (revision 7218)
 +++ trac/ticket/query.py        (working copy)
 @@ -43,6 +43,8 @@
@@ -51 +51 @@
          kw_strs = ['order', 'group', 'page', 'max']
          kw_arys = ['rows']
-@@ -132,11 +135,11 @@
+@@ -132,18 +135,18 @@
          for filter_ in filters:
              filter_ = filter_.split('=')
@@ -65 +65 @@
              # from last char of `field`, get the mode of comparison
              mode, neg = '', ''
-             if field[-1] in ('~', '^', '$'):
-@@ -142,8 +145,8 @@
              if field[-1] in ('~', '^', '$'):
                  mode = field[-1]
@@ -106 +104 @@
              db = self.env.get_db_cnx()
          cursor = db.cursor()
-@@ -279,10 +280,10 @@
+@@ -279,18 +280,15 @@
              fields += [f for f in self.fields if f['name'] == column] or [None]
          results = []
@@ -120 +118 @@
                  if name == self.group:
                      val = val or 'None'
-@@ -288,9 +289,6 @@
-                     val = val or 'None'
                  elif name == 'reporter':
                      val = val or 'anonymous'
@@ -141 +137 @@
          enum_columns = ('resolution', 'priority', 'severity')
          # Build the list of actual columns to query
-@@ -418,6 +418,19 @@
+@@ -418,15 +418,27 @@
                         % (col, col, col))
  
@@ -161 +157 @@
                  name = 't.' + name
              else:
-@@ -422,11 +435,10 @@
-                 name = 't.' + name
-             else:
                  name = name + '.value'
 -            value = value[len(mode) + neg:]
@@ -184 +177 @@
                      value)
  
-@@ -446,12 +458,15 @@
+@@ -446,18 +458,22 @@
          for k, v in self.constraints.items():
              if req:
@@ -204 +197 @@
  
              # Special case id ranges
-             if k == 'id':
-@@ -457,7 +472,8 @@
              if k == 'id':
                  ranges = Ranges()
@@ -224 +215 @@
              # Special case for exact matches on multiple values
              elif not mode and len(v) > 1:
-@@ -480,9 +496,9 @@
+@@ -480,16 +496,16 @@
                  else:
                      col = k + '.value'
@@ -236 +227 @@
                  constraint_sql = filter(None,
                                          [get_constraint_sql(k, val, mode, neg)
-@@ -489,7 +505,7 @@
                                           for val in v])
                  if not constraint_sql:
@@ -245 +235 @@
                          [item[0] for item in constraint_sql]) + ")")
                  else:
-@@ -567,6 +583,7 @@
+@@ -567,27 +583,27 @@
  
      def template_data(self, context, tickets, orig_list=None, orig_time=None,
@@ -251 +241 @@
 +        global is_op
          constraints = {}
-         for k, v in self.constraints.items():
-             constraint = {'values': [], 'mode': ''}
-@@ -571,13 +588,16 @@
          for k, v in self.constraints.items():
              constraint = {'values': [], 'mode': ''}
@@ -274 +261 @@
              constraints[k] = constraint
  
-@@ -584,10 +604,6 @@
          cols = self.get_columns()
          labels = dict([(f['name'], f['label']) for f in self.fields])
@@ -305 +291 @@
  
          # For clients without JavaScript, we remove constraints here if
-@@ -1037,9 +1055,6 @@
+@@ -1043,9 +1061,6 @@
              kwargs['format'] = argv[0]