Ticket #454: 454-save-edit-history-r8561.patch

trac/htdocs/css/ticket.css

@@ -87 +87 @@
 }
 .threading, #changelog .inlinebuttons { float: right; }
 .threading { font-size: 85%; }
+#changelog .trac-lastedit {
+ margin-left: 1em;
+ color: #999;
+ font-size: 90%;
+}
+#changelog .trac-lastedit :link, #changelog .trac-lastedit :visited { color: inherit }
 
 #preview .changes, #changelog .changes { list-style: square; margin-left: 2em; padding: 0 }
 #preview .comment, #changelog .comment { margin-left: 2em }

trac/ticket/model.py

@@ -367 +367 @@
         for listener in TicketSystem(self.env).change_listeners:
             listener.ticket_deleted(self)
 
-    def modify_comment(self, cnum, comment, db=None):
+    def modify_comment(self, cnum, author, comment, when=None, db=None):
+        scnum = str(cnum)
+        if when is None:
+            when = datetime.now(utc)
+        when_ts = to_timestamp(when)
+        
         db, handle_ta = self._get_db_for_write(db)
+        like = db.like()
         cursor = db.cursor()
-        cursor.execute("UPDATE ticket_change SET newvalue=%%s "
+        cursor.execute("SELECT time,newvalue FROM ticket_change "
                        "WHERE ticket=%%s AND field='comment' "
-                       "  AND (oldvalue=%%s OR oldvalue %s)"
-                       % db.like(),
-                       (comment, self.id, str(cnum),
-                        '%.' + db.like_escape(str(cnum))))
+                       "  AND (oldvalue=%%s OR oldvalue %s)" % like,
+                       (self.id, scnum, '%.' + db.like_escape(scnum)))
+        for (ts, old_comment) in cursor:
+            cursor.execute("SELECT COUNT(ticket) FROM ticket_change "
+                           "WHERE ticket=%%s AND time=%%s AND field %s" % like,
+                           (self.id, ts, db.like_escape('_comment') + '%'))
+            rev = cursor.fetchone()[0]
+            cursor.execute("INSERT INTO ticket_change "
+                           "(ticket,time,author,field,oldvalue,newvalue) "
+                           "VALUES (%s,%s,%s,%s,%s,%s)",
+                           (self.id, ts, author, '_comment%d' % rev,
+                            old_comment, str(when_ts)))
+            cursor.execute("UPDATE ticket_change SET newvalue=%s "
+                           "WHERE ticket=%s AND time=%s AND field='comment'",
+                           (comment, self.id, ts))
+            break
         if handle_ta:
             db.commit()  
 

trac/ticket/templates/ticket.html

@@ -216 +216 @@
           <h2>Change History</h2>
           <div id="changelog">
             <py:for each="change in changes">
-              <div class="change">
+              <div class="change" py:with="show_editor = can_edit_comment and str(change.cnum) == cnum_edit">
                 <h3 class="change">
                   <span class="threading" py:if="'cnum' in change"
                         py:with="change_replies = replies.get(str(change.cnum), [])">
@@ -234 +234 @@
                   </span>
                   <i18n:msg params="date, author">Changed ${dateinfo(change.date)} ago by ${authorinfo(change.author)}</i18n:msg>
                 </h3>
-                <div py:if="not (can_edit_comment and str(change.cnum) == cnum_edit)" class="inlinebuttons">
+                <div py:if="not show_editor" class="inlinebuttons">
                   <form py:if="'cnum' in change and can_append" 
                         method="get" action="#comment" class="inlinebuttons">
                     <div>
@@ -251 +251 @@
                   </form>              
                 </div>
                 ${display_change(change)}
-                <form py:if="can_edit_comment and str(change.cnum) == cnum_edit" method="post" action="#comment:${change.cnum}">
+                <div py:if="not show_editor and change.last_edit.rev >= 0" i18n:msg="date, author" class="trac-lastedit">
+                  Last edited ${dateinfo(change.last_edit.date)} ago by ${authorinfo(change.last_edit.author)}
+                  (<a href="">diff</a>)
+                </div>
+                <form py:if="show_editor" method="post" action="#comment:${change.cnum}">
                   <div>
                     <textarea id="trac-edited_comment" name="edited_comment" class="wikitext" rows="10" cols="78">
 ${[edited_comment, change.comment][edited_comment is None]}</textarea>

trac/ticket/web_ui.py

@@ -492 +492 @@
                 req.perm(ticket.resource).require('TICKET_EDIT_COMMENT')
                 comment = req.args.get('edited_comment')
                 cnum = req.args.get('cnum_edit')
-                ticket.modify_comment(cnum, comment)
+                ticket.modify_comment(cnum, req.authname, comment)
                 req.redirect(req.href.ticket(ticket.id))
 
             # Do any action on the ticket?
@@ -1468 +1468 @@
                     yield current
                 last_uid = uid
                 current = {'date': date, 'author': author, 'fields': {},
-                           'permanent': permanent, 'comment': ''}
+                           'permanent': permanent, 'comment': '',
+                           'last_edit': {'rev': -1}}
                 if permanent and not when:
                     autonum += 1
                     current['cnum'] = autonum
@@ -1482 +1483 @@
                     else:
                         this_num = old
                     current['cnum'] = int(this_num)
+            elif field.startswith('_comment'):      # Comment edits
+                rev = int(field[8:])
+                if rev > current['last_edit']['rev']:
+                    last_edit = datetime.fromtimestamp(int(new), utc)
+                    current['last_edit'] = {'rev': rev, 'author': author,
+                                            'date': last_edit}
             elif old or new:
                 current['fields'][field] = {'old': old, 'new': new}
         if current: