← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pappacena/launchpad:pgk-upload-log-positioning into launchpad:master

 

Thiago F. Pappacena has proposed merging ~pappacena/launchpad:pgk-upload-log-positioning into launchpad:master.

Commit message:
Use different padding depending on how many columns we have on package upload queue

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/launchpad/+git/launchpad/+merge/378679

On "Done" status, no action can be performed on the package upload. Therefore, no checkbox column.

On status without those checkboxes, the layout for the package upload logs were broken, with too much padding from the left. This should fix that.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/launchpad:pgk-upload-log-positioning into launchpad:master.
diff --git a/lib/lp/soyuz/templates/distroseries-queue.pt b/lib/lp/soyuz/templates/distroseries-queue.pt
index 39629ce..3850174 100644
--- a/lib/lp/soyuz/templates/distroseries-queue.pt
+++ b/lib/lp/soyuz/templates/distroseries-queue.pt
@@ -147,10 +147,14 @@
                 </td>
              </tr>
            </tbody>
-           <tbody tal:attributes="class string:${filelist_class}">
+           <tbody tal:attributes="class string:${filelist_class}"
+                  tal:define="hasActions python: len(view.availableActions()) > 0">
              <metal:filelist use-macro="template/macros/package-filelist"/>
+
              <tr class="log-content" tal:repeat="log packageupload/logs">
-               <td colspan="2" style="border: 0"></td>
+               <td tal:attributes="colspan python: 2 if hasActions else 1"
+                   style="border: 0"></td>
+
                <td colspan="8" style="border: 0">
                  <span tal:content="log/new_status"></span>
                  <span tal:attributes="title log/date_created/fmt:datetime"

Follow ups