Make compatible with Trac 1.2

[Darren]

TracJsGanttPlugin does not work in 1.2 changing get_db_cnx to get_read_db in tracjsgantt.py and tracpm.py seems to help make it display, but all tasks seem to be 2 days.

[Ryan J Ollos]

Please use a summary that is consistent with your request.

[Rochi]

Patch for DB API 1.2 and datetime support

tracjsgantt.py

@@ -406 +406 @@
 
         def _buildEnumMap(field):
             self.classMap = {}
-            db = self.env.get_db_cnx()
-            cursor = db.cursor()
-            cursor.execute("SELECT name," +
+           with self.env.db_query as db:
+               cursor = db.cursor()
+               cursor.execute("SELECT name," +
                            db.cast('value', 'int') +
                            " FROM enum WHERE type=%s", (field,))
-            for name, value in cursor:
-                self.classMap[name] = value
+               for name, value in cursor:
+                       self.classMap[name] = value
 
         display = None
         colorBy = options['colorBy']

tracpm.py

@@ -324 +324 @@
     # otherwise.
     def isSet(self, ticket, field):
         if self.isCfg(field) \
-                and len(ticket[self.fields[field]]) != 0:
+                and isinstance(ticket[self.fields[field]], datetime) and len(str(ticket[self.fields[field]])) != 0:
             return True
+       elif self.isCfg(field) \
+               and len(ticket[self.fields[field]]) != 0:
+           return True
         else:
             return False
 
@@ -336 +339 @@
         if not dateString:
             d = None
         else:
-            d = datetime(*time.strptime(dateString,
+           if isinstance(dateString, datetime):
+               d = dateString
+            else:
+               d = datetime(*time.strptime(dateString,
                                         self.dbDateFormat)[0:7])
             d = d.replace(hour=0, minute=0, second=0, microsecond=0,
                           tzinfo=localtz)

The patch is not tested yet, but seems to work at first glance.

I will test the patch the next few days.

[Ryan J Ollos]

Please attach proposed changes as a patch file (​TracDev/SubmittingPatches).

[Rochi]

Patch

[Ryan J Ollos]

In 17149:

Trac-jsGantt 1.2.0.0dev: Branch for Trac 1.2 and conform to PEP8

Refs #13175.

[Ryan J Ollos]

In 17150:

Trac-jsGantt 1.2.0.0dev: Make compatible with Trac 1.2+

Fixes #13175.