+ This ticket has been modified since you started editing. The
+ other modifications are highlighted.
+
-
diff --git a/trac/ticket/templates/ticket_change.html b/trac/ticket/templates/ticket_change.html
--- a/trac/ticket/templates/ticket_change.html
+++ b/trac/ticket/templates/ticket_change.html
@@ -4,7 +4,7 @@ Render a ticket comment.
Arguments:
- change: the change data
- show_editor=False: if True, show a comment editor
- - edited_comment: the current value of the comment edito
+ - edited_comment: the current value of the comment editor
- cnum_edit: the comment number being edited
-->
+
+
+ $prefix$cnum
+
+
+
+
+
diff --git a/trac/ticket/templates/ticket_preview.html b/trac/ticket/templates/ticket_preview.html
--- a/trac/ticket/templates/ticket_preview.html
+++ b/trac/ticket/templates/ticket_preview.html
@@ -6,7 +6,15 @@ to a ticket change auto-preview.
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ py:with="can_append = 'TICKET_APPEND' in perm(ticket.resource);
+ has_edit_comment = 'TICKET_EDIT_COMMENT' in perm(ticket.resource);"
py:strip="">
-
-
+
+
+
+
+
diff --git a/trac/ticket/web_ui.py b/trac/ticket/web_ui.py
--- a/trac/ticket/web_ui.py
+++ b/trac/ticket/web_ui.py
@@ -493,7 +493,7 @@ class TicketModule(Component):
data.update({'action': None,
'reassign_owner': req.authname,
'resolve_resolution': None,
- 'timestamp': str(ticket['changetime'])})
+ 'start_time': ticket['changetime']})
elif req.method == 'POST': # 'Preview' or 'Submit'
if 'cancel_comment' in req.args:
req.redirect(req.href.ticket(ticket.id))
@@ -556,9 +556,9 @@ class TicketModule(Component):
req.args['preview'] = True
# Preview an existing ticket (after a Preview or a failed Save)
+ start_time = from_utimestamp(long(req.args.get('start_time', 0)))
data.update({
- 'action': action,
- 'timestamp': req.args.get('ts'),
+ 'action': action, 'start_time': start_time,
'reassign_owner': (req.args.get('reassign_choice')
or req.authname),
'resolve_resolution': req.args.get('resolve_choice'),
@@ -570,7 +570,7 @@ class TicketModule(Component):
'reassign_owner': req.authname,
'resolve_resolution': None,
# Store a timestamp for detecting "mid air collisions"
- 'timestamp': str(ticket['changetime'])})
+ 'start_time': ticket['changetime']})
data.update({'comment': req.args.get('comment'),
'cnum_edit': req.args.get('cnum_edit'),
@@ -655,7 +655,7 @@ class TicketModule(Component):
return 'ticket.html', data, None
def _prepare_data(self, req, ticket, absurls=False):
- return {'ticket': ticket,
+ return {'ticket': ticket, 'to_utimestamp': to_utimestamp,
'context': web_context(req, ticket.resource,
absurls=absurls),
'preserve_newlines': self.must_preserve_newlines}
@@ -1141,7 +1141,8 @@ class TicketModule(Component):
# Mid air collision?
if ticket.exists and (ticket._old or comment or force_collision_check):
- if req.args.get('ts') != str(ticket['changetime']):
+ changetime = ticket['changetime']
+ if req.args.get('view_time') != str(to_utimestamp(changetime)):
add_warning(req, _("Sorry, can not save your changes. "
"This ticket has been modified by someone else "
"since you started"))
@@ -1187,8 +1188,6 @@ class TicketModule(Component):
# Validate comment numbering
try:
- # comment index must be a number
- int(req.args.get('cnum') or 0)
# replyto must be 'description' or a number
replyto = req.args.get('replyto')
if replyto != 'description':
@@ -1239,12 +1238,6 @@ class TicketModule(Component):
req.redirect(req.href.ticket(ticket.id))
def _do_save(self, req, ticket, action):
- cnum = req.args.get('cnum')
- replyto = req.args.get('replyto')
- internal_cnum = cnum
- if cnum and replyto: # record parent.child relationship
- internal_cnum = '%s.%s' % (replyto, cnum)
-
# Save the action controllers we need to call side-effects for before
# we save the changes to the ticket.
controllers = list(self._get_action_controllers(req, ticket, action))
@@ -1253,10 +1246,11 @@ class TicketModule(Component):
fragment = ''
now = datetime.now(utc)
- if ticket.save_changes(get_reporter_id(req, 'author'),
- req.args.get('comment'), when=now,
- cnum=internal_cnum):
- fragment = '#comment:' + cnum if cnum else ''
+ cnum = ticket.save_changes(get_reporter_id(req, 'author'),
+ req.args.get('comment'), when=now,
+ replyto=req.args.get('replyto'))
+ if cnum:
+ fragment = '#comment:%d' % cnum
try:
tn = TicketNotifyEmail(self.env)
tn.notify(ticket, newticket=False, modtime=now)
@@ -1575,8 +1569,7 @@ class TicketModule(Component):
ticket[user])
data.update({
'context': context,
- 'fields': fields, 'changes': changes,
- 'replies': replies, 'cnum': cnum + 1,
+ 'fields': fields, 'changes': changes, 'replies': replies,
'attachments': AttachmentModule(self.env).attachment_data(context),
'action_controls': action_controls,
'action': selected_action,
diff --git a/tracopt/ticket/deleter.py b/tracopt/ticket/deleter.py
--- a/tracopt/ticket/deleter.py
+++ b/tracopt/ticket/deleter.py
@@ -54,6 +54,7 @@ class TicketDeleter(Component):
# ITemplateStreamFilter methods
def filter_stream(self, req, method, filename, stream, data):
+ # TODO: Also handle ticket_preview.html
if filename != 'ticket.html':
return stream
ticket = data.get('ticket')
@@ -74,6 +75,7 @@ class TicketDeleter(Component):
def delete_comment():
for event in buffer:
cnum = event[1][1].get('id')[12:]
+ # FIXME: Identify comment by timestamp instead of cnum
return tag.form(
tag.div(
tag.input(type='hidden', name='action',