Edgewall Software
Modify

Opened 3 years ago

Closed 3 years ago

#12730 closed defect (fixed)

Revert buttons are no longer shown in displaying ticket conflicts

Reported by: Ryan J Ollos Owned by: Ryan J Ollos
Priority: normal Milestone: 1.2.1
Component: ticket system Version:
Severity: normal Keywords:
Cc: Branch:
Release Notes:

Fixed missing ticket field change conflict markers (regression).

API Changes:

Description (last modified by Ryan J Ollos)

On 1.2-stable we see:

On trunk the revert links are no longer displayed:

For both 1.2-stable and trunk, the property changes should be highlighted as conflicts. Here is what we see on 1.0-stable:

Attachments (3)

Screen Shot 2017-03-15 at 11.37.36.png (215.7 KB ) - added by Ryan J Ollos 3 years ago.
Screen Shot 2017-03-15 at 11.37.12.png (199.7 KB ) - added by Ryan J Ollos 3 years ago.
Screen Shot 2017-03-15 at 11.34.17.png (203.4 KB ) - added by Ryan J Ollos 3 years ago.

Download all attachments as: .zip

Change History (9)

by Ryan J Ollos, 3 years ago

by Ryan J Ollos, 3 years ago

by Ryan J Ollos, 3 years ago

comment:1 by Ryan J Ollos, 3 years ago

Description: modified (diff)

comment:2 by Ryan J Ollos, 3 years ago

Description: modified (diff)

comment:3 by Ryan J Ollos, 3 years ago

Component: generalticket system
Milestone: 1.3.21.2.1
Owner: set to Ryan J Ollos
Status: newassigned

Revert buttons restored in r15686. Assigning to milestone:1.2.1 to fix the missing change conflict markers.

comment:4 by Ryan J Ollos, 3 years ago

Release Notes: modified (diff)

Fixed on 1.2-stable in [15690:15691]. On the trunk, the variable conflicts was being reassigned in ticket.html. Proposed fix: [dad377d0/rjollos.git].

comment:5 by Christian Boos, 3 years ago

Good catch! Thanks for taking care of this one. Fix looks good (but maybe emph_<sentence> instead of <sentence>_text?).

comment:6 by Ryan J Ollos, 3 years ago

Resolution: fixed
Status: assignedclosed

Thanks, fixed in r15696.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Ryan J Ollos.
The resolution will be deleted. Next status will be 'reopened'.
to as closed The owner will be changed from Ryan J Ollos to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.