Merge lp:~ken-vandine/ubuntu-system-settings/lp1505663 into lp:ubuntu-system-settings

Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1548
Merged at revision: 1551
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1505663
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~gang65/ubuntu-system-settings/ubuntu-system-settings-remove-retry-button
Diff against target: 32 lines (+5/-3)
1 file modified
plugins/system-update/PageComponent.qml (+5/-3)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1505663
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Sebastien Bacher (community) Approve
Review via email: mp+276182@code.launchpad.net

This proposal supersedes a proposal from 2015-10-20.

Commit message

Ensure we only check for updates when NetworkingStatus.online is true

Description of the change

Ensure we only check for updates when NetworkingStatus.online is true

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

thanks, you have a console.warn() in there though, I guess it's a debug leftover?

the onClicked change also needs wrong, shouldn't we rather disable the button instead of having the action showed to the user but not doing that it should?

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
1548. By Ken VanDine

Removed debugging output

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

that's better, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/system-update/PageComponent.qml'
2--- plugins/system-update/PageComponent.qml 2015-10-29 20:41:53 +0000
3+++ plugins/system-update/PageComponent.qml 2015-10-29 20:41:53 +0000
4@@ -84,7 +84,8 @@
5 onFinished: {
6 credentialsNotification.visible = false;
7 root.state = "SEARCHING";
8- UpdateManager.checkUpdates();
9+ if (NetworkingStatus.online)
10+ UpdateManager.checkUpdates();
11 }
12 }
13
14@@ -147,7 +148,7 @@
15 PropertyChanges { target: installAllButton; visible: false}
16 PropertyChanges { target: checkForUpdatesArea; visible: true}
17 PropertyChanges { target: updateNotification; visible: false}
18- PropertyChanges { target: activity; running: true}
19+ PropertyChanges { target: activity; running: NetworkingStatus.online}
20 },
21 State {
22 name: "NOUPDATES"
23@@ -179,7 +180,8 @@
24 Component.onCompleted: {
25 credentialsNotification.visible = false;
26 root.state = "SEARCHING";
27- UpdateManager.checkUpdates();
28+ if (NetworkingStatus.online)
29+ UpdateManager.checkUpdates();
30 }
31
32 onUpdateAvailableFound: {

Subscribers

People subscribed via source and target branches