Remaining issues with Genshi post-509

[eblot]

I'm not sure this is the right way to proceed (feel free to close this ticket if it isn't), but there are some remaining issues with the current trunk and Genshi, so rather than opening one ticket per encountered issue, I'll post the description of several of them within the same ticket.

[eblot]

with [5187], Genshi 532

File "/local/engine/trac/trac/templates/diff_div.html", line 91, in <Expression u'longcol'>
  <th title="$longcol $item.old.rev">

This error occurs while attempting to review a wiki change.

[eblot]

Another issue while previewing a wiki page: NameError with 'diff'.

The following patch seems to fix up the issue (although I'm not confident in it and won't commit it…):

wiki/templates/wiki_edit.html

@@ -46 +46 @@
             </tbody>
           </table>
           <fieldset id="preview" py:choose="">
-            <legend>${diff and 'Review Changes' or 'Preview'} (<a href="#edit">skip</a>)</legend>
-            <div py:when="diff" class="diff">
+            <legend>${'diff' in req.args and 'Review Changes' or 'Preview'} (<a href="#edit">skip</a>)</legend>
+            <div py:when="'diff' in req.args" class="diff">
               <xi:include href="diff_div.html" py:with="no_id=True" />
             </div>
             <div py:otherwise="" class="wikipage">${wiki_to_html(context, page.text)}</div>

[eblot]

When an attachment cannot be previewed

trac/templates/macros.html

@@ -128 +128 @@
   -
   -->
   <py:def function="preview_file(preview)">
+    <py:if test="'rendered' in preview">
     ${preview.rendered}
+    </py:if>
     <py:choose>
-      <p py:when="not preview.rendered">
+      <p py:when="'rendered' not in preview">
         <strong>HTML preview not available</strong>,
         <py:choose>
           <py:when test="preview.max_file_size_reached">

[eblot]

Replying to eblot:

Another diff rendering issue occurs while viewing changeset changes.

data['no_id'] = ...

is not defined in changeset.py​

[eblot]

Another small issue when attempting to add a new milestone (milestones is not defined)

trac/ticket/templates/milestone_edit.html

@@ -66 +66 @@
                      value="${format_date(milestone.completed) or format_date}" />
               <em>Format: ${datetime_hint}</em>
             </label>
-            <py:if test="milestones">
+            <py:if test="defined('milestones')">
               <br/>
               <input type="checkbox" id="retarget" name="retarget" checked="checked" />
               <label>Retarget associated open tickets to milestone:

[cboos]

Replying to eblot:

This error occurs while attempting to review a wiki change.

Fixed in r5192.

[cboos]

Replying to eblot:

Another diff rendering issue occurs while viewing changeset changes.

Also fixed in r5192.

[cboos]

Remaining issues fixed in r5193. Not closing the ticket though, as there are likely more issues with this.

In general for the fixes, we shouldn't use defined(), as it was only defined itself since ​[Genshi 510] and we want to retain compatibility with ​[Genshi 509].
I also tend to favor setting up the correct default values in the model, rather than making the templates look ugly (i.e. using the .get('...') calls).

[eblot]

Replying to cboos:

In general for the fixes, we shouldn't use defined(), as it was only defined itself since ​[Genshi 510] and we want to retain compatibility with ​[Genshi 509].

Ok, I did not know that and I'll look at your changes to understand how to write clean fixes.

[eblot]

• Error when some fields have been changed but no comment has been added to a ticket

  ticket.html

  @@ -216 +216 @@
                       </py:choose>
                     </li>
                   </ul>
  -                <div py:if="change.comment" class="comment searchable">
  +                <div py:if="'comment' in change" class="comment searchable">
                     ${wiki_to_html(context, change.comment)}
                   </div>
                 </div>

[eblot]

Error with any ticket that does not contain a value for a custom field.
This is the case for tickets that have not been edited after new custom field is added to the configuration file.

UndefinedError is triggered on source:trunk/trac/ticket/templates/ticket.html@5178#L119​

   <py:if test="field">${ticket[field.name]}</py:if>

[eblot]

I'm not sure about how to reproduce this one, anyway:

UndefinedError is triggered on source:trunk/trac/ticket/templates/ticket.html@5178#L164​

 <span class="threading" py:if="replies and 'cnum' in change"
  py:with="change_replies = replies[str(change.cnum)]">

It seems that the replies array contains unicode keys, as a typical error is

UndefinedError: {u'2': [3]} has no member named "1"

[eblot]

When a new ticket is created then updated with the following actions:

1. status is changed
2. a file is attached

next rendering of the ticket triggers a UndefinedError on source:trunk/trac/ticket/templates/ticket.html@5178#L191​

  <ul py:if="change.fields" class="changes">
    <li py:for="field_name, field in change.fields.items()"
        py:with="filed_type = field_types[field_name]">
      <strong>${field_name}</strong>

UndefinedError: {'status': 'radio', [...]} has no member named "attachment"

[cboos]

Replying to eblot:

Error with any ticket that does not contain a value for a custom field.
This is the case for tickets that have not been edited after new custom field is added to the configuration file.

Fixed in r5197.

[cboos]

Replying to eblot:

I'm not sure about how to reproduce this one

comment threading issues fixed in r5198.

[cboos]

Replying to eblot:

• Error when some fields have been changed but no comment has been added to a ticket

Replying to such changes also triggered an error, fixed by r5212.

[cboos]

Looks like we're done with all those little issues.