← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~henninge/launchpad/bug-792092-build-now into lp:launchpad

 

Henning Eggers has proposed merging lp:~henninge/launchpad/bug-792092-build-now into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #792092 in Launchpad itself: "Minor UI regression in recipe "Build now" Ajax"
  https://bugs.launchpad.net/launchpad/+bug/792092

For more details, see:
https://code.launchpad.net/~henninge/launchpad/bug-792092-build-now/+merge/68521

= Summary =

Bug 792092 is caused by the IDs of the rows in the recipe builds table
having been removed.

== Proposed fix ==

Revert the revision to restore the IDs.

== Implementation details ==

I also changed the Makefile to include filenames in launchpad.js.
This makes it easier to jump to a certain file when debugging
Javascript in the browser.

== Demo and Q/A ==

Create a new recipe for daily builds on a branch. It will have the
"Build now..." button. Click it and watch for the result message and
the green flashes to appear.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/templates/sourcepackagerecipe-builds.pt
  Makefile

./lib/lp/code/templates/sourcepackagerecipe-builds.pt
      13: unbound prefix
./Makefile
     275: Line exceeds 78 characters.
-- 
https://code.launchpad.net/~henninge/launchpad/bug-792092-build-now/+merge/68521
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~henninge/launchpad/bug-792092-build-now into lp:launchpad.
=== modified file 'Makefile'
--- Makefile	2011-07-18 20:39:02 +0000
+++ Makefile	2011-07-20 11:18:35 +0000
@@ -177,7 +177,10 @@
 ifeq ($(JS_BUILD), min)
 	cat $^ | $(PY) -m lp.scripts.utilities.js.jsmin > $@
 else
-	cat $^ > $@
+	for jsname in $^ ; do \
+	    echo "/* $$jsname */" >> $@ ;\
+	    cat $$jsname >> $@ ;\
+	done
 endif
 
 jsbuild: $(PY) $(JS_OUT)

=== modified file 'lib/lp/code/templates/sourcepackagerecipe-builds.pt'
--- lib/lp/code/templates/sourcepackagerecipe-builds.pt	2011-05-03 05:20:12 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-builds.pt	2011-07-20 11:18:35 +0000
@@ -12,7 +12,7 @@
   <tbody>
     <tal:recipe-builds repeat="build view/builds">
       <tal:build-view define="buildview nocall:build/@@+index">
-        <tr class="package-build">
+        <tr class="package-build" tal:attributes="id string:build-${build/id}">
           <td>
             <span tal:replace="structure build/image:icon" />
             <a tal:content="buildview/status"
@@ -41,7 +41,7 @@
         </tr>
         <tal:binary-builds repeat="binary buildview/binary_builds">
           <tr tal:define="binaryview nocall:binary/@@+index"
-              class="binary-build">
+              class="binary-build" tal:attributes="id string:build-${binary/id}">
             <td class="indent">
               <span tal:replace="structure binary/image:icon"/>
               <a tal:content="binary/source_package_release/title"


Follow ups