Ticket #5641: custom_enum.diff

ticket/api.py

@@ -168 +168 @@
             }
             if field['type'] == 'select' or field['type'] == 'radio':
                 field['options'] = config.getlist(name + '.options', sep='|')
+                if len(field['options']) == 1 and field['options'][0].startswith('enum:'):
+                    enum_name = field['options'][0].split(':')[1]
+                    db = self.env.get_db_cnx()
+                    cursor = db.cursor()
+                    cursor.execute("SELECT name,value FROM enum WHERE type=%s "
+                                   "ORDER BY " + db.cast('value', 'int'),
+                                   (enum_name,))
+                    field['options'].pop()
+                    for name,value in cursor:
+                        field['options'].append(name)
                 if '' in field['options']:
                     field['optional'] = True
                     field['options'].remove('')

ticket/model.py

@@ -318 +318 @@
 class AbstractEnum(object):
     type = None
     ticket_col = None
+    custom = False
 
     def __init__(self, env, name=None, db=None):
         if not self.ticket_col:
@@ -400 +401 @@
                        (self.name, self.value, self.type, self._old_name))
         if self.name != self._old_name:
             # Update tickets
-            cursor.execute("UPDATE ticket SET %s=%%s WHERE %s=%%s" %
-                           (self.ticket_col, self.ticket_col),
-                           (self.name, self._old_name))
+            if self.custom:
+                cursor.execute("UPDATE ticket_custom SET value=%s "
+                               "WHERE name=%s AND value=%s",
+                               (self.name, self.ticket_col, self._old_name))
+            else:
+                cursor.execute("UPDATE ticket SET %s=%%s WHERE %s=%%s" %
+                               (self.ticket_col, self.ticket_col),
+                               (self.name, self._old_name))
 
         if handle_ta:
             db.commit()