Edgewall Software

Ticket #2618: mid_air_collision_retry-bboisvert2.patch

File mid_air_collision_retry-bboisvert2.patch, 3.1 KB (added by bboisvert@…, 6 years ago)

futher tweaks to attachment:mid_air_collision_retry-bboisvert.patch​ to deal with some weird timestamp resolution conflicts and improve formatting

  • trac/ticket/web_ui.py

     
    479479 
    480480        # Mid air collision? 
    481481        if int(req.args.get('ts')) != ticket.time_changed: 
     482            ts = ticket.time_changed 
    482483            self._insert_ticket_data(req, None, ticket, 
    483484                                     req.args.get('author')) 
    484485            self._populate_misc(req, db) 
    … …  
    487488            self._insert_ticket_data(req, None, ticket, 
    488489                                     req.args.get('author')) 
    489490            self._populate_misc(req, db) 
     491            req.hdf['ticket.ts'] = ts 
    490492            return 'ticket_error_midair.cs', None 
    491493 
    492494        self._validate_ticket(req, ticket) 

  • templates/ticket_error_midair.cs

     
    1919   } 
    2020 </script> 
    2121 <form action="<?cs var:ticket.href ?>#preview" method="post"> 
    22  <input type="hidden" name="author" value="<?cs var:ticket.reporter_id ?>" /> 
    23  <table cellspacing="0" border="1"> 
    24   <tr> 
    25    <th>&nbsp;</th> 
    26    <th colspan="2">Committed</th> 
    27    <th colspan="2">Yours</th> 
    28    <th colspan="2">Merged</th> 
    29   </tr><?cs 
     22 <input type="hidden" name="author" value="<?cs var:newticket.reporter_id ?>" /> 
     23 <?cs set:t.started = 0 ?> 
     24 <?cs 
    3025  each:field = ticket.fields ?><?cs 
    3126   if:ticket[name(field)] == newticket[name(field)] ?> 
    3227   <input type="hidden" name="<?cs var:name(field) ?>" value="<?cs var:newticket[name(field)] ?>" /><?cs 
    33    else ?> 
     28   else ?><?cs 
     29    if:! t.started ?> 
     30     <table cellspacing="0" border="1"> 
     31      <tr> 
     32       <th>&nbsp;</th> 
     33       <th colspan="2">Committed</th> 
     34       <th colspan="2">Yours</th> 
     35       <th colspan="2">Merged</th> 
     36      </tr><?cs 
     37    /if ?> 
    3438    <tr> 
    3539     <th><?cs var:name(field) ?></th> 
    3640     <td><input type="radio" name="sel_<?cs var:name(field) ?>" id="sel_<?cs var:name(field) ?>_old" onclick="setField('<?cs var:name(field) ?>', 'old');" /></td> 
    … …  
    4549     </td> 
    4650    </tr><?cs 
    4751   /if ?><?cs 
    48   /each ?> 
    49   <input type="hidden" name="reassign_owner" value="<?cs var:ticket.reassign_owner ?>" /> 
    50   <input type="hidden" name="action" value="<?cs var:ticket.action ?>" /> 
    51   <input type="hidden" name="ts" value="<?cs var:ticket.ts ?>" /> 
    52   <input type="hidden" name="comment" value="<?cs var:ticket.comment ?>" /> 
    53  </table> 
     52  /each ?><?cs 
     53 if:t.started ?> 
     54  </table><?cs 
     55 /if ?> 
     56 <input type="hidden" name="reassign_owner" value="<?cs var:newticket.reassign_owner ?>" /> 
     57 <input type="hidden" name="action" value="<?cs var:newticket.action ?>" /> 
     58 <input type="hidden" name="ts" value="<?cs var:ticket.ts ?>" /> 
     59 <input type="hidden" name="comment" value="<?cs var:newticket.comment ?>" /> 
    5460 
    5561  <div class="buttons"> 
    5662   <input type="submit" name="preview" value="Retry"  />&nbsp; 
    5763  </div> 
     64<?cs var:ticket.ts ?><br /> 
     65<?cs var:newticket.ts ?> 
    5866 </form> 
    5967</div>