Merge lp:~sylvain-pineau/ubuntu/trusty/checkbox/bug-1287389-1287395 into lp:ubuntu/trusty/checkbox

[Sylvain Pineau]

Fixes for the two linked bugs, already fixed in trunk.

[Daniel Manrique (roadmr)]

Looks good and the changes target the linked bug specifically, so this looks OK for merging under Feature Freeze constraints. Thanks!

review: Approve

=== modified file 'checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml	2014-02-03 19:24:31 +0000
+++ checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml	2014-03-05 14:47:37 +0000
@@ -228,7 +228,7 @@
             skipcheck.enabled = true;
 
             // Outcome values refer to PBJobResult enums
-            if (outcome === 2 /* PBJobResult_Pass */) {
+            if (suggested_outcome === 2 /* PBJobResult_Pass */) {
                 yescheck.checked = true;
                 nocheck.checked = false;
                 skipcheck.checked = false; // we didnt skip it

=== modified file 'checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml'
--- checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml	2014-02-03 19:24:31 +0000
+++ checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml	2014-03-05 14:47:37 +0000
@@ -79,7 +79,6 @@
                     var item = whiteListModel.get(i);
                     if (item.testname.match(/default/i)) {
                         whiteListModel.setProperty(i, "check", true);
-                        return;
                     }
                 }
                 suiteSelect();
@@ -125,6 +124,7 @@
             bottom: parent.bottom
             margins: units.gu(2)
         }
+        enabled: false
         text: i18n.tr("OK")
         color: UbuntuColors.lightAubergine
         onClicked: {

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-19 19:43:48 +0000
+++ debian/changelog	2014-03-05 14:47:37 +0000
@@ -1,3 +1,12 @@
+checkbox (0.17.6-0ubuntu2) trusty; urgency=low
+
+  [Sylvain Pineau]
+  * Update the default whitelist selection check mark on startup (LP: #1287389)
+  * Properly set the suggested outcome for user-interact type jobs. Due to a
+    variable name change, the outcome wasn't getting set (LP: #1287395)
+
+ -- Sylvain Pineau <[e-mail]>  Wed, 05 Mar 2014 15:34:29 +0100
+
 checkbox (0.17.6-0ubuntu1) trusty; urgency=low
 
   * New upstream release, changes detailed in checkbox-old/CHANGELOG