Merge lp:~seb128/ubuntu-archive-scripts/noncandid-migrate-after into lp:ubuntu-archive-scripts

[Sebastien Bacher]

The migrate after information is not restricted to candidate items

example report on

https://people.canonical.com/~seb128/reportafter.html

the xdg-desktop-portal has a rational there when it has no information on the current report

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'templates/team-report.html'
--- templates/team-report.html	2020-09-17 19:50:01 +0000
+++ templates/team-report.html	2020-09-22 10:16:47 +0000
@@ -138,17 +138,16 @@
           {% endfor %}
           {% endif %}
           {% if d["is-candidate"] %}
+          <li><b>candidate</b></li>
+          {% endif %}
+          {% endif %}
           {% if d.get('dependencies', {}).get('migrate-after', []) %}
-          <li><b>candidate</b> but also requires 
+          <li>Requires 
           {% for depmigrate in d.get('dependencies', {}).get('migrate-after', []) %}
           <a href="http://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html#{{ depmigrate }}">{{ depmigrate }}</a>
           {%- if not loop.last %}, {% endif %}
           {% endfor %}
           to migrate</li>
-          {% else %}
-          <li><b>candidate</b></li>
-          {% endif %}
-          {% endif %}
           {% endif %}
         </ul>
       </li>