Merge lp:~kaxing/checkbox/fix-1318538 into lp:checkbox

Proposed by kaxing
Status: Merged
Approved by: Daniel Manrique
Approved revision: 3010
Merged at revision: 3014
Proposed branch: lp:~kaxing/checkbox/fix-1318538
Merge into: lp:checkbox
Diff against target: 36 lines (+5/-3)
2 files modified
checkbox-gui/checkbox-gui/qml/RunManagerView.qml (+4/-2)
checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml (+1/-1)
To merge this branch: bzr merge lp:~kaxing/checkbox/fix-1318538
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Brendan Donegan (community) Abstain
Zygmunt Krynicki Pending
Review via email: mp+219807@code.launchpad.net

Description of the change

To make "success" variable able to use in SubmissionDialog, I've declared "success" as a property attribute in "updater" object, so we can use updater.success in other dialog.

To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Please use runmanagerview.success, as in SubmissionDialog.qml:

136 + if (success) {
137 + runmanagerview.reportIsSaved = success;
138 + }

review: Needs Fixing
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Actually ignore that - but I'm not sure updater is the right place.

Revision history for this message
Brendan Donegan (brendan-donegan) :
review: Abstain
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1, tested "in the field" and it works OK, plus without this, we can't even submit, so let's go ahead.

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

The attempt to merge lp:~kaxing/checkbox/fix-1318538 into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'

Revision history for this message
Daniel Manrique (roadmr) wrote :

reapproving due to the tarmac failure.

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

The attempt to merge lp:~kaxing/checkbox/fix-1318538 into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/7494631/
[precise] stderr: http://paste.ubuntu.com/7494632/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Destroying VM and associated drives...
[precise] Running cleanup tasks for 'shell' provisioner...
[precise] Running cleanup tasks for 'shell' provisioner...
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/7494635/
[trusty] stderr: http://paste.ubuntu.com/7494636/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed VM to reclaim resources
[trusty] Destroying VM and associated drives...
[trusty] Running cleanup tasks for 'shell' provisioner...
[trusty] Running cleanup tasks for 'shell' provisioner...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-gui/checkbox-gui/qml/RunManagerView.qml'
2--- checkbox-gui/checkbox-gui/qml/RunManagerView.qml 2014-05-14 14:45:02 +0000
3+++ checkbox-gui/checkbox-gui/qml/RunManagerView.qml 2014-05-16 10:18:13 +0000
4@@ -62,6 +62,8 @@
5
6 property bool running;
7
8+ property bool success;
9+
10 Connections {
11 target: guiEngine
12
13@@ -83,8 +85,8 @@
14 // update ui
15 var option_list = new Array("client-name=" + client_name);
16 var export_path = settings.value("exporter/xml_export_path", "/tmp/submission.xml")
17-
18- var success = guiEngine.GuiExportSessionToFileAsXML(export_path,
19+
20+ updater.success = guiEngine.GuiExportSessionToFileAsXML(export_path,
21 option_list);
22 runbuttons.resultsButtonEnabled = true;
23 progress.title = i18n.tr("Completed") + " (" + utils.formatElapsedTime((new Date() - updater.startTime)) + ")";
24
25=== modified file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
26--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml 2014-05-14 13:56:59 +0000
27+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml 2014-05-16 10:18:13 +0000
28@@ -92,7 +92,7 @@
29 var export_path = settings.value("exporter/xml_export_path", "/tmp/submission.xml")
30
31 if (submit_to == "certification") {
32- if (success) {
33+ if (updater.success) {
34 dialog.text = guiEngine.SendSubmissionViaCertificationTransport(export_path,
35 upload_input.text,
36 submit_to_hexr.checked);

Subscribers

People subscribed via source and target branches