Changeset 14515

Timestamp:

Apr 2, 2015, 6:02:53 AM (9 years ago)

Author:

Ryan J Ollos

Message:

4.0.0dev: Avoid traceback when custom field value is None.

Initial patch by leerw@…. Fixes #12180.

Location:

masterticketsplugin/trunk

Files:

• mastertickets/model.py (modified) (1 diff)
• setup.py (modified) (1 diff)

masterticketsplugin/trunk/mastertickets/model.py

@@ -71 +71 @@
 
                 if update_field is not None:
-                    cursor.execute('SELECT value FROM ticket_custom WHERE ticket=%s AND name=%s',
-                                   (n, str(field)))
-                    old_value = (cursor.fetchone() or ('',))[0]
-                    new_value = [x.strip() for x in old_value.split(',') if x.strip()]
+                    old_value = self.env.db_query("""
+                        SELECT value FROM ticket_custom WHERE ticket=%s AND name=%s
+                        """, (n, field))[0][0]
+                    if old_value:
+                        new_value = [x.strip() for x in old_value.split(',') if x.strip()]
+                    else:
+                        new_value = []
                     update_field(new_value)
                     new_value = ', '.join(sorted(new_value, key=lambda x: int(x)))

masterticketsplugin/trunk/setup.py

@@ -51 +51 @@
     ],
 
-    install_requires=['Trac>=0.12'],
-
     test_suite='mastertickets.tests.suite',
     entry_points={