Ticket #2178: trac-r2353.fix-2178-and-2063.diff

trac/ticket/api.py

@@ -64 +64 @@
 
         # Owner field, can be text or drop-down depending on configuration
         field = {'name': 'owner', 'label': 'Owner'}
-        if self.config.get('ticket', 'restrict_owner').lower() in util.TRUE:
+        restrict_owner_cfg = self.config.get('ticket', 'restrict_owner').lower()
+        if restrict_owner_cfg in util.TRUE + ['username', 'name', 'name+username']:
             field['type'] = 'select'
             users = []
             for username, name, email in self.env.get_known_users(db):
-                users.append(username)
+                # Show name, username or 'name (username)', depending
+                # on configuration and available data
+                if name is None or restrict_owner_cfg in util.TRUE + ['username' ]:
+                    label = username
+                else: 
+                    if restrict_owner_cfg == 'name+username' and name is not None:
+                        label = '%s (%s)' % (name, username)
+                    else: 
+                        label = name
+
+            users.append({'value':username, 'label':label})
             field['options'] = users
             field['optional'] = True
         else:
@@ -90 +101 @@
                 # Fields without possible values are treated as if they didn't
                 # exist
                 continue
+            optionItems = []
+            for option in options:
+                optionItems.append({'value':option, 'label':option})
             field = {'name': name, 'type': 'select', 'label': name.title(),
                      'value': self.config.get('ticket', 'default_' + name),
-                     'options': options}
+                     'options': optionItems}
             if name in ('status', 'resolution'):
                 field['type'] = 'radio'
             elif name in ('milestone', 'version'):
@@ -124 +138 @@
             }
             if field['type'] == 'select' or field['type'] == 'radio':
                 options = self.config.get('ticket-custom', name + '.options')
-                field['options'] = [value.strip() for value in options.split('|')]
+                field['options'] = {}
+                field['options']['value'] = [value.strip() for value in options.split('|')]
+                field['options']['label'] = [value.strip() for value in options.split('|')]
             elif field['type'] == 'textarea':
                 field['width'] = self.config.get('ticket-custom', name + '.cols')
                 field['height'] = self.config.get('ticket-custom', name + '.rows')

trac/ticket/web_ui.py

@@ -119 +119 @@
                 field['label'] = 'Assign to'
             elif name == 'milestone':
                 # Don't make completed milestones available for selection
-                options = field['options'][:]
+                optionItems = field['options'][:]
                 for option in field['options']:
-                    milestone = Milestone(self.env, option, db=db)
-                    if milestone.is_completed:
-                        options.remove(option)
-                field['options'] = options
+                    milestone = Milestone(self.env, option['value'], db=db)
+                    if not milestone.is_completed:
+                        optionItems.append({'value':option, 'label':option})
+                field['options'] = optionItems
             req.hdf['newticket.fields.' + name] = field
 
         add_stylesheet(req, 'common/css/ticket.css')
@@ -371 +371 @@
         for field in TicketSystem(self.env).get_ticket_fields():
             if field['type'] in ('radio', 'select'):
                 value = ticket.values.get(field['name'])
-                if value and not value in field['options']:
+                if value and not value in [item['value'] for item in field['options']]:
                     # Current ticket value must be visible even if its not in the
                     # possible values
-                    field['options'].append(value)
+                    field['options'].append({'value':value,'label':value})
             name = field['name']
             del field['name']
             if name in ('summary', 'reporter', 'description', 'type', 'status',

trac/ticket/tests/model.py

@@ -1 +1 @@
 from trac.config import Configuration
-from trac.ticket.model import Ticket, Component, Priority
+from trac.ticket.model import Ticket, Component, Priority, Type
 from trac.test import EnvironmentStub
 
 import unittest
@@ -211 +211 @@
         p = Priority(self.env, 'bar')
         p.delete()        
 
+    def test_ticket_type_enum(self):
+        """
+        The Type (ticket type) enum class behaves a little different than
+        the rest, so it gets some additional testing.
+        """
+        t = Type(self.env, 'task')
+        self.assertEqual(t.name, 'task')
+        self.assertEqual(t.value, '3')
+        t.name = 'foo'
+        t.update()
+
 def suite():
     return unittest.makeSuite(TicketModelTestCase, 'test')
 

templates/ticket.cs

@@ -194 +194 @@
         var:name(field) ?>" name="<?cs
         var:name(field) ?>"><?cs
         if:field.optional ?><option></option><?cs /if ?><?cs
-        each:option = field.options ?><option<?cs
+        each:option = field.options ?><option<?cs var option:value ?><?cs
          if:option == ticket[name(field)] ?> selected="selected"<?cs /if ?>><?cs
-         var:option ?></option><?cs
+         var:option.label ?></option><?cs
         /each ?></select><?cs
       elif:field.type == 'checkbox' ?><input type="hidden" name="checkbox_<?cs
         var:name(field) ?>" /><input type="checkbox" id="<?cs

templates/macros.cs

@@ -2 +2 @@
  <select size="1" id="<?cs var:name ?>" name="<?cs var:name ?>"><?cs
   if:optional ?><option></option><?cs /if ?><?cs
   each:option = options ?>
-   <option<?cs if:option == selected ?> selected="selected"<?cs /if ?>><?cs 
-     var:option ?></option><?cs
+   <option value="<?cs var:option.value?>"<?cs if:option == selected ?> selected="selected"<?cs /if ?>><?cs 
+     var:option.label ?></option><?cs
   /each ?>
  </select><?cs
 /def?><?cs

templates/newticket.cs

@@ -64 +64 @@
       elif:field.type == 'select' ?><select id="<?cs
         var:name(field) ?>" name="<?cs var:name(field) ?>"><?cs
         if:field.optional ?><option></option><?cs /if ?><?cs
-        each:option = field.options ?><option<?cs
+        each:option = field.options ?><option value="<?cs var:option.value ?>" <?cs
          if:option == newticket[name(field)] ?> selected="selected"<?cs /if ?>><?cs
-         var:option ?></option><?cs
+         var:option.label ?></option><?cs
         /each ?></select><?cs
       elif:field.type == 'checkbox' ?><input type="hidden" name="checkbox_<?cs
         var:name(field) ?>" /><input type="checkbox" id="<?cs