[LNT] Split newlines in all params/fields for Machine and Run in run view.

[marxin]

Summary

Let's split values with multiple lines in all fields in the view. Hope it's quite straightforward.

[marxin]

Move the template to utils.html and use it in v4_machine.html.

[marxin]

May I please remind a patch review.

[MatzeB]

Looks good enought to commit, though I would recommend factoring things out differently:

lnt/server/ui/templates/utils.html

134–145 ↗

(On Diff #139263)

It feels a bit odd, that the macro is specifically designed to put <dt>/</dt> around the contents. I'd recommend going for a newline_to_br(value) macro and leaving the <td>s for the callers of the macros.

[marxin]

Thanks for review, I modified the patch in way you described.

lnt/trunk/lnt/server/ui/templates/utils.html

</script>
     <ul class="help-inline">
     {% for error in field.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
 
     </div>
 {% endmacro %}
+
+{% macro newline_to_br(value) %}
+  {# Split lines in multi-line values. #}
+  {% if '\n' in value|string %}
+    {% for ln in (value|string).split('\n') %}
+      {{ ln }}<br/>
+    {% endfor %}
+  {% else %}
+    {{value}}
+  {% endif %}
+{% endmacro %}

lnt/trunk/lnt/server/ui/templates/v4_machine.html

<thead>
       <tr>
         <th>Name</th>
         <th>Value</th>
       </tr>
     </thead>
     {% for key,value in machine.parameters|dictsort %}
     <tr>
       <td>{{key}}</td>
-      <td>{{value}}</td>
+      <td>{{ utils.newline_to_br(value) }}</td>
     </tr>
     {% endfor %}
   </table>
   </section>
 
     <section id="compare">
         <h3>Compare</h3>
             <p>Compare the latest run on this machine with the latest run on another.</p>

lnt/trunk/lnt/server/ui/templates/v4_run.html

$('.profile-prev-only').tooltip();
 
   <section id="machine_info">
   {{ utils.render_popup_begin('machine_info', 'Machine Info', true) }}
   <h4>Fields</h4>
   <table class="table table-striped table-condensed table-hover">
   {% for item in machine.fields %}
     <tr>
       <td> <b>{{item.name}}</b> </td>
-      <td>{{machine.get_field(item)}}</td>
+      <td>{{ utils.newline_to_br(machine.get_field(item)) }}</td>
     </tr>
   {% endfor %}
   </table>
 
   <h4>Parameters</h4>
   <table class="table table-striped table-condensed table-hover">
   {% for key,value in machine.parameters|dictsort %}
     <tr>
       <td> <b>{{key}}</b> </td>
-      <td>{{value}}</td>
+      <td>{{ utils.newline_to_br(value) }}</td>
     </tr>
   {% endfor %}
   </table>
   {{ utils.render_popup_end() }}
   </section>
 
   <section id="run_info">
   {{ utils.render_popup_begin('run_info', 'Run Info', true) }}
   <h4>Fields</h4>
   <table class="table table-striped table-condensed table-hover">
     <thead>
       <tr><th>Name</th><th>Value</th></tr>
     </thead>
     {% for item in run.fields %}
       <tr>
         <td> <b>{{item.name}}</b> </td>
-        <td>{{run.get_field(item)}}</td>
+        <td>{{ utils.newline_to_br(run.get_field(item)) }}</td>
       </tr>
     {% endfor %}
   </table>
 
   <h4>Parameters</h4>
   <table class="table table-striped table-condensed table-hover">
     <thead>
       <tr><th>Name</th><th>Value</th></tr>
     </thead>
     {% for key, value in run.parameters|dictsort(case_sensitive=True) %}
       <tr>
         <td> <b>{{key}}</b> </td>
-        {# Split lines in multi-line values. #}
-        {% if '\n' in value|string %}
-          <td>
-          {% for ln in (value|string).split('\n') %}
-            {{ ln }}<br/>
-          {% endfor %}
-          </td>
-        {% else %}
-          <td>{{value}}</td>
-        {% endif %}
+        <td>{{ utils.newline_to_br(value) }}</td>
       </tr>
     {% endfor %}
   </table>
   {{ utils.render_popup_end() }}
   </section>
 
   <section id="view_options">
   {{ utils.render_popup_begin('view_options', 'View Options', true) }}