NewWorkflow: patch-newworkflow-r1034.diff

htdocs/css/timeline.css

@@ -30 +30 @@
 /* Apply icon background-image twice to avoid hover-flicker in IE/Win */
 dt.changeset, dt.changeset a { background-image: url(../changeset.png) !important }
 dt.newticket, dt.newticket a { background-image: url(../newticket.png) !important }
+dt.resolvedticket, dt.resolvedticket a { background-image: url(../resolvedticket.png) !important }
+dt.reopenedticket, dt.reopenedticket a { background-image: url(../reopenedticket.png) !important }
 dt.closedticket, dt.closedticket a { background-image: url(../closedticket.png) !important }
 dt.wiki, dt.wiki a { background-image: url(../wiki.png) !important }
 dt.milestone, dt.milestone a { background-image: url(../milestone.png) !important }

wiki-default/TracIni

@@ -22 +22 @@
 See also: TracLogging
 
 == [ticket] ==
+|| workflow_version  || Workflow version: 1 for simple, 2 for advanced ||
 || default_version   || Default version for newly created tickets ||
 || default_severity  || Default severity for newly created tickets ||
 || default_priority  || Default priority for newly created tickets ||

wiki-default/TracAdmin

@@ -23 +23 @@
 permission add <user> <action>      -- Add a new permission rule
 permission remove <user> <action>   -- Remove permission rule
 component list                      -- Show available components
-component add <name> <owner>        -- Add a new component
+component add <name> <owner> [<qaowner>]   -- Add a new component
 component rename <name> <newname>   -- Rename a component
 component remove <name>             -- Remove/uninstall component
-component chown <name> <owner>      -- Change component ownership
+component chown <name> <owner> [<qaowner>] -- Change component ownership
 priority list                       -- Show possible ticket priorities
 priority add <value>                -- Add a priority value option
 priority change <value> <newvalue>  -- Change a priority value
@@ -41 +41 @@
 version time <name> <time>          -- Set version date/time
 version remove <name>               -- Remove version
 milestone list                      -- Show milestones
-milestone add <name> [time]         -- Add milestone
+milestone add <name> [<owner> [time]] -- Add milestone
 milestone rename <name> <newname>   -- Rename milestone
 milestone time <name> <time>        -- Set milestone date/time
+milestone chown <name> <owner>      -- Change milestone ownership
 milestone remove <name>             -- Remove milestone
 }}}
 

scripts/trac-admin

@@ -290 +290 @@
     
 #    ## Component
     _help_component = [('component list', 'Show available components'),
-                       ('component add <name> <owner>', 'Add a new component'),
+                       ('component add <name> <owner> [<qaowner>]', 'Add a new component'),
                        ('component rename <name> <newname>', 'Rename a component'),
                        ('component remove <name>', 'Remove/uninstall component'),
-                       ('component chown <name> <owner>', 'Change component ownership')]
+                       ('component chown <name> <owner> [<qaowner>]', 'Change component ownership')]
 
     def complete_component (self, text, line, begidx, endidx):
         if begidx in [16,17]:
@@ -309 +309 @@
         try:
             if arg[0]  == 'list':
                 self._do_component_list()
-            elif arg[0] == 'add' and len(arg)==3:
+            elif arg[0] == 'add' and len(arg) in [3,4]:
                 name = arg[1]
                 owner = arg[2]
-                self._do_component_add(name, owner)
+                if len(arg) == 4:
+                    qaowner = arg[3]
+                else:
+                    qaowner = owner
+                self._do_component_add(name, owner, qaowner)
             elif arg[0] == 'rename' and len(arg)==3:
                 name = arg[1]
                 newname = arg[2]
@@ -320 +324 @@
             elif arg[0] == 'remove'  and len(arg)==2:
                 name = arg[1]
                 self._do_component_remove(name)
-            elif arg[0] == 'chown' and len(arg)==3:
+            elif arg[0] == 'chown' and len(arg) in [3,4]:
                 name = arg[1]
                 owner = arg[2]
-                self._do_component_set_owner(name, owner)
+                if len(arg) == 4:
+                    qaowner = arg[3]
+                else:
+                    qaowner = owner
+                self._do_component_set_owner(name, owner, qaowner)
             else:    
                 self.do_help ('component')
         except Exception, e:
             print 'Component %s failed:' % arg[0], e
 
     def _do_component_list(self):
-        data = self.db_execsql('SELECT name, owner FROM component') 
-        self.print_listing(['Name', 'Owner'], data)
+        data = self.db_execsql('SELECT name, owner, qaowner FROM component') 
+        self.print_listing(['Name', 'Owner', 'QA Owner'], data)
 
-    def _do_component_add(self, name, owner):
-        data = self.db_execsql("INSERT INTO component VALUES('%s', '%s')"
-                               % (name, owner))
+    def _do_component_add(self, name, owner, qaowner):
+        data = self.db_execsql("INSERT INTO component VALUES('%s', '%s', '%s')"
+                               % (name,owner,qaowner))
 
     def _do_component_rename(self, name, newname):
         cnx = self.db_open()
@@ -360 +368 @@
         data = self.db_execsql("DELETE FROM component WHERE name='%s'"
                                % (name))
 
-    def _do_component_set_owner(self, name, owner):
+    def _do_component_set_owner(self, name, owner, qaowner):
         cnx = self.db_open()
         cursor = cnx.cursor ()
         cursor.execute('SELECT name FROM component WHERE name=%s', name)
         data = cursor.fetchone()
         if not data:
             raise Exception("No such component '%s'" % name)
-        data = self.db_execsql("UPDATE component SET owner='%s' WHERE name='%s'"
-                               % (owner,name))
+        data = self.db_execsql("UPDATE component SET owner='%s', qaowner='%s' WHERE name='%s'"
+                               % (owner,qaowner,name))
 
 
     ## Permission
@@ -795 +803 @@
 
     ## Milestone
     _help_milestone = [('milestone list', 'Show milestones'),
-                       ('milestone add <name> [time]', 'Add milestone'),
+                       ('milestone add <name> [<owner> [time]]', 'Add milestone'),
                        ('milestone rename <name> <newname>',
                         'Rename milestone'),
+                       ('milestone chown <name> <newowner>', 'Change milestone owner'),
                        ('milestone time <name> <time>', 'Set milestone date (Format: "Jun 3, 2003")'),
                        ('milestone remove <name>', 'Remove milestone')]
 
@@ -805 +814 @@
 
         if begidx in [15,17]:
             comp = self.get_milestone_list ()
+        elif begidx > 15 and line.startswith('milestone chown '):
+            comp = self.get_user_list()
         elif begidx < 15:
-            comp = ['list','add','rename','time','remove']
+            comp = ['list','add','rename','chown','time','remove']
         return self.word_complete(text, comp)
 
     def do_milestone(self, line):
-        self._do_mile_ver('milestone', line)
+        type = 'milestone'
+        arg = self.arg_tokenize(line)
+        try:
+            if arg[0]  == 'list':
+                self._do_milestone_list()
+            elif arg[0] == 'add' and len(arg) in [2,3,4]:
+                name = arg[1]
+                self._do_mile_ver_add(type, name)
+                if len(arg) >= 3:
+                    owner = arg[2]
+                    self._do_mile_ver_chown(type, name, owner)
+                if len(arg) >= 4:
+                    time = arg[3]
+                    self._do_mile_ver_time(type, name, time)
+            elif arg[0] == 'rename' and len(arg)==3:
+                name = arg[1]
+                newname = arg[2]
+                self._do_mile_ver_rename(type, name, newname)
+            elif arg[0] == 'chown' and len(arg)==3:
+                name = arg[1]
+                owner = arg[2]
+                self._do_mile_ver_chown(type, name, owner)
+            elif arg[0] == 'time' and len(arg)==3:
+                name = arg[1]
+                time = arg[2]
+                self._do_mile_ver_time(type, name, time)
+            elif arg[0] == 'remove' and len(arg)==2:
+                name = arg[1]
+                self._do_mile_ver_remove(type, name)
+            else:
+                self.do_help (type)
+        except Exception, e:
+            print 'Command %s failed:' % arg[0], e
 
+    def _do_milestone_list(self):
+        data = self.db_execsql("SELECT name,owner,time FROM milestone ORDER BY time,name")
+        data = map(lambda x: (x[0], x[1], x[2] and time.strftime('%c', time.localtime(x[2]))), data)
+        #print data
+        self.print_listing(['Name', 'Owner', 'Time'], data)
 
+
     ## Version
     _help_version = [('version list', 'Show versions'),
                        ('version add <name> [time]', 'Add version'),
@@ -832 +881 @@
     def do_version(self, line):
         self._do_mile_ver('version', line)
 
-    # Milestone and Version are identical,  methods
+    # Milestone and Version are almost identical,  methods
 
     def _do_mile_ver(self, type, line):
         arg = self.arg_tokenize(line)
@@ -923 +972 @@
         else:
             print >> sys.stderr, 'Unknown time format'
 
+    def _do_mile_ver_chown(self, type, name, owner):
+        data = self.db_execsql("UPDATE %s SET owner='%s' WHERE name='%s'"
+                               % (type, owner, name));
+
     _help_upgrade = [('upgrade', 'Upgrade database to current version.')]
     def do_upgrade(self, line):
         arg = self.arg_tokenize(line)

trac/db_default.py

@@ -21 +21 @@
 
 
 # Database version identifier. Used for automatic upgrades.
-db_version = 7
+db_version = 8
+# Current workflow version identifier
+current_workflow_version = 2
 
 def __mkreports(reps):
     """Utility function used to create report data in same syntax as the
@@ -125 +127 @@
 );
 CREATE TABLE component (
          name            text PRIMARY KEY,
-         owner           text
+         owner           text,
+         qaowner         text
 );
 CREATE TABLE milestone (
          id              integer PRIMARY KEY,
          name            text,
          time            integer,
+         owner           text,
          descr           text,
          UNIQUE(name)
 );
@@ -209 +213 @@
 """,
 """
 SELECT p.value AS __color__,
-   version AS __group__,
-   id AS ticket, summary, component, version, severity, 
+   (CASE WHEN IFNULL(version, '') = '' THEN 'Not Specified' ELSE 'Version ' || version END) AS __group__,
+   id AS ticket, summary, component, milestone, severity, 
    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
    time AS created,
    changetime AS _changetime, description AS _description,
@@ -218 +222 @@
   FROM ticket t, enum p
   WHERE status IN ('new', 'assigned', 'reopened') 
 AND p.name = t.priority AND p.type = 'priority'
-  ORDER BY (version IS NULL),version, p.value, severity, time
+  ORDER BY (IFNULL(version, '') = '') DESC,version, p.value, severity, time
 """),
 #----------------------------------------------------------------------------
-('All Tickets by Milestone',
+('Active Tickets by Milestone',
 """
 This report shows how to color results by priority,
 while grouping results by milestone.
@@ -231 +235 @@
 """,
 """
 SELECT p.value AS __color__,
-   milestone||' Release' AS __group__,
+   (CASE WHEN IFNULL(milestone, '') = '' THEN 'Not Assigned' ELSE milestone||' Release' END) AS __group__,
    id AS ticket, summary, component, version, severity, 
    (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
    time AS created,
@@ -240 +244 @@
   FROM ticket t, enum p
   WHERE status IN ('new', 'assigned', 'reopened') 
 AND p.name = t.priority AND p.type = 'priority'
-  ORDER BY (milestone IS NULL),milestone, p.value, severity, time
+  ORDER BY (IFNULL(milestone, '') = '') DESC,milestone, p.value, severity, time
 """),
 #----------------------------------------------------------------------------
 ('Assigned, Active Tickets by Owner',
@@ -248 +252 @@
 List assigned tickets, group by ticket owner, sorted by priority.
 """,
 """
-
 SELECT p.value AS __color__,
-   owner AS __group__,
-   id AS ticket, summary, component, milestone, severity, time AS created,
+   (CASE WHEN IFNULL(owner, '') = '' THEN 'Not Assigned' ELSE owner END) AS __group__,
+   id AS ticket, summary, component, version, milestone, severity, time AS created,
    changetime AS _changetime, description AS _description,
    reporter AS _reporter
   FROM ticket t,enum p
   WHERE status = 'assigned'
 AND p.name=t.priority AND p.type='priority'
-  ORDER BY owner, p.value, severity, time
+  ORDER BY (IFNULL(owner, '') = '') DESC, owner, p.value, severity, time
 """),
 #----------------------------------------------------------------------------
 ('Assigned, Active Tickets by Owner (Full Description)',
@@ -268 +271 @@
 """
 SELECT p.value AS __color__,
    owner AS __group__,
-   id AS ticket, summary, component, milestone, severity, time AS created,
+   id AS ticket, summary, component, version, milestone, severity, time AS created,
    description AS _description_,
    changetime AS _changetime, reporter AS _reporter
   FROM ticket t, enum p
@@ -283 +286 @@
 """,
 """
 SELECT p.value AS __color__,
-   t.milestone AS __group__,
+   (CASE WHEN IFNULL(t.milestone, '') = '' THEN 'Not Assigned' ELSE t.milestone || ' Release' END) AS __group__,
    (CASE status 
       WHEN 'closed' THEN 'color: #777; background: #ddd; border-color: #ccc;'
       ELSE 
@@ -295 +298 @@
    time AS _time,reporter AS _reporter
   FROM ticket t,enum p
   WHERE p.name=t.priority AND p.type='priority'
-  ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'), 
+  ORDER BY (IFNULL(milestone, '') = '') DESC, milestone DESC, (status = 'closed'), 
         (CASE status WHEN 'closed' THEN modified ELSE -p.value END) DESC
 """),
 #----------------------------------------------------------------------------
@@ -308 +311 @@
 """
 SELECT p.value AS __color__,
    (CASE status WHEN 'assigned' THEN 'Assigned' ELSE 'Owned' END) AS __group__,
-   id AS ticket, summary, component, version, milestone,
+   id AS ticket, summary, component, status, version, milestone,
    severity, priority, time AS created,
    changetime AS _changetime, description AS _description,
    reporter AS _reporter
   FROM ticket t, enum p
-  WHERE t.status IN ('new', 'assigned', 'reopened') 
+  WHERE t.status <> 'closed' 
 AND p.name = t.priority AND p.type = 'priority' AND owner = '$USER'
   ORDER BY (status = 'assigned') DESC, p.value, milestone, severity, time
 """),
@@ -338 +341 @@
   WHERE status IN ('new', 'assigned', 'reopened') 
 AND p.name = t.priority AND p.type = 'priority'
   ORDER BY (owner = '$USER') DESC, p.value, milestone, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Open Tickets, Mine first',
+"""
+ * List all not closed tickets by priority.
+ * Show all tickets owned by the logged in user in a group first.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE owner 
+     WHEN '$USER' THEN 'My Tickets' 
+     ELSE 'Open Tickets' 
+    END) AS __group__,
+   id AS ticket, summary, component, status, version, milestone, severity, 
+   (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status <> 'closed' 
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (owner = '$USER') DESC, p.value, milestone, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Open Tickets by Version',
+"""
+ * List all not closed tickets by priority.
+ * Group results by version.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(version, '') = '' THEN 'Not Specified' ELSE 'Version ' || version END) AS __group__,
+   id AS ticket, summary, component, status, milestone, severity, 
+   (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status <> 'closed'
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (IFNULL(version, '') = '') desc,version, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Open Tickets by Milestone',
+"""
+ * List all not closed tickets by priority.
+ * Group results by milestone.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(milestone, '') = '' THEN 'Not Assigned' ELSE milestone||' Release' END) AS __group__,
+   id AS ticket, summary, component, status, version, severity, 
+   (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status <> 'closed' 
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (IFNULL(milestone, '') = '') DESC,milestone, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Open Tickets by Owner',
+"""
+List not closed tickets, group by ticket owner, sorted by priority.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(owner, '') = '' THEN 'Not Assigned' ELSE owner END) AS __group__,
+   id AS ticket, summary, component, status, version, milestone, severity,
+   time AS created, changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t,enum p
+  WHERE status <> 'closed'
+AND p.name=t.priority AND p.type='priority'
+  ORDER BY (IFNULL(owner, '') = '') DESC, owner, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Open Tickets by Status',
+"""
+ * List all not closed tickets by priority.
+ * Group results by status.
+""",
+"""
+SELECT p.value AS __color__,
+   status AS __group__,
+   id AS ticket, summary, component, version, milestone, severity, owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum q, enum p
+  WHERE status <> 'closed' 
+AND q.name = t.status AND q.type = 'status'
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY q.value, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Resolved Tickets, Mine first',
+"""
+ * List all resolved tickets by priority.
+ * Show all tickets owned by the logged in user in a group first.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE owner 
+     WHEN '$USER' THEN 'My Tickets' 
+     ELSE 'Active Tickets' 
+    END) AS __group__,
+   id AS ticket, summary, component, version, milestone, severity, 
+   (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status = 'resolved' 
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (owner = '$USER') DESC, p.value, milestone, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Resolved Tickets by Milestone',
+"""
+List resolved tickets, sorted by priority, grouped by milestone
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(milestone, '') = '' THEN 'Not Assigned' ELSE milestone||' Release' END) AS __group__,
+   id AS ticket, summary, component, version, severity, 
+   (CASE status WHEN 'assigned' THEN owner||' *' ELSE owner END) AS owner,
+   time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status = 'resolved' 
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (IFNULL(milestone, '') = '') DESC,milestone, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Resolved Tickets by Owner',
+"""
+List resolved tickets, group by ticket owner, sorted by priority.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(owner, '') = '' THEN 'Not Assigned' ELSE owner END) AS __group__,
+   id AS ticket, summary, component, version, milestone, severity, time AS created,
+   changetime AS _changetime, description AS _description,
+   reporter AS _reporter
+  FROM ticket t,enum p
+  WHERE status = 'resolved'
+AND p.name=t.priority AND p.type='priority'
+  ORDER BY (IFNULL(owner, '') = '') DESC, owner, p.value, severity, time
+"""),
+#----------------------------------------------------------------------------
+('Verified Tickets by Milestone (Full Description)',
+"""
+Release Notes: List verified and closed tickets, group by milestone, include description.
+""",
+"""
+SELECT p.value AS __color__,
+   (CASE WHEN IFNULL(milestone, '') = '' THEN 'Not Assigned' ELSE milestone||' Release' END) AS __group__,
+   id AS ticket, summary, component, status, version, severity, time AS created,
+   description AS _description_,
+   changetime AS _changetime, reporter AS _reporter
+  FROM ticket t, enum p
+  WHERE status IN ('verified', 'closed')
+AND p.name = t.priority AND p.type = 'priority'
+  ORDER BY (IFNULL(milestone, '') = '') DESC,milestone, p.value, severity, time
 """))
 
 
@@ -347 +517 @@
 
 # (table, (column1, column2), ((row1col1, row1col2), (row2col1, row2col2)))
 data = (('component',
-             ('name', 'owner'),
-               (('component1', 'somebody'),
-                ('component2', 'somebody'))),
+             ('name', 'owner', 'qaowner'),
+               (('component1', 'somebody', 'qasomebody'),
+                ('component2', 'somebody', 'qasomebody'))),
            ('milestone',
              ('name', 'time'),
                (('', 0), 
@@ -367 +537 @@
                (('status', 'new', 1),
                 ('status', 'assigned', 2),
                 ('status', 'reopened', 3),
-                ('status', 'closed', 4),
+                ('status', 'resolved', 4),
+                ('status', 'verified', 5),
+                ('status', 'closed', 6),
                 ('resolution', 'fixed', 1),
                 ('resolution', 'invalid', 2),
                 ('resolution', 'wontfix', 3),
                 ('resolution', 'duplicate', 4),
                 ('resolution', 'worksforme', 5),
+                ('resolution', 'moved', 6),
                 ('severity', 'blocker', 1),
                 ('severity', 'critical', 2),
                 ('severity', 'major', 3),
@@ -426 +599 @@
   ('project', 'footer',
    ' Visit the Trac open source project at<br />'
    '<a href="http://trac.edgewall.com/">http://trac.edgewall.com/</a>'),
+  ('ticket', 'workflow_version', str(current_workflow_version)),
   ('ticket', 'default_version', ''),
   ('ticket', 'default_severity', 'normal'),
   ('ticket', 'default_priority', 'normal'),

trac/Milestone.py

@@ -60 +60 @@
     if not group:
         queries['all_tickets'] = env.href.query({'milestone': milestone})
         queries['active_tickets'] = env.href.query({
-            'milestone': milestone, 'status': ['new', 'assigned', 'reopened']
+            'milestone': milestone, 'status': ['new', 'assigned', 'reopened', 'resolved']
         })
         queries['closed_tickets'] = env.href.query({
-            'milestone': milestone, 'status': 'closed'
+            'milestone': milestone, 'status': ['closed', 'verified']
         })
     else:
         queries['all_tickets'] = env.href.query({
@@ -71 +71 @@
         })
         queries['active_tickets'] = env.href.query({
             'milestone': milestone, grouped_by: group,
-            'status': ['new', 'assigned', 'reopened']
+            'status': ['new', 'assigned', 'reopened', 'resolved']
         })
         queries['closed_tickets'] = env.href.query({
             'milestone': milestone, grouped_by: group,
-            'status': 'closed'
+            'status': ['closed', 'verified']
         })
     return queries
 
 def calc_ticket_stats(tickets):
     total_cnt = len(tickets)
-    active = [ticket for ticket in tickets if ticket['status'] != 'closed']
+    active = [ticket for ticket in tickets if ticket['status'] != 'closed' and ticket['status'] != 'verified']
     active_cnt = len(active)
     closed_cnt = total_cnt - active_cnt
 
@@ -116 +116 @@
                 if datestr:
                     date = self.parse_date(datestr)
             descr = self.args.get('descr', '')
+            owner = self.args.get('owner', '')
             if not id:
-                self.create_milestone(name, date, descr)
+                self.create_milestone(name, date, descr, owner)
             else:
-                self.update_milestone(id, name, date, descr)
+                self.update_milestone(id, name, date, descr, owner)
         elif id:
             self.req.redirect(self.env.href.milestone(id))
         else:
@@ -141 +142 @@
                             'Invalid Date Format')
         return seconds
 
-    def create_milestone(self, name, date=0, descr=''):
+    def create_milestone(self, name, date=0, descr='', owner=''):
         self.perm.assert_permission(perm.MILESTONE_CREATE)
         if not name:
             raise TracError('You must provide a name for the milestone.',
                             'Required Field Missing')
         cursor = self.db.cursor()
         self.env.log.debug("Creating new milestone '%s'" % name)
-        cursor.execute("INSERT INTO milestone (id, name, time, descr) "
-                       "VALUES (NULL, %s, %d, %s)", name, date, descr)
+        cursor.execute("INSERT INTO milestone (id, name, time, descr, owner) "
+                       "VALUES (NULL, %s, %d, %s, %s)", name, date, descr, owner)
         self.db.commit()
         self.req.redirect(self.env.href.milestone(name))
 
@@ -179 +180 @@
         else:
             self.req.redirect(self.env.href.milestone(id))
 
-    def update_milestone(self, id, name, date, descr):
+    def update_milestone(self, id, name, date, descr, owner):
         self.perm.assert_permission(perm.MILESTONE_MODIFY)
         cursor = self.db.cursor()
         self.env.log.debug("Updating milestone '%s'" % id)