Merge lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278 into lp:ubuntu-system-settings
Proposed by
Jonas G. Drange
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1360 |
Merged at revision: | 1365 |
Proposed branch: | lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278 |
Merge into: | lp:ubuntu-system-settings |
Prerequisite: | lp:~jonas-drange/ubuntu-system-settings/apn-no-overwrite-1415495 |
Diff against target: |
260 lines (+136/-38) 4 files modified
plugins/cellular/CMakeLists.txt (+1/-0) plugins/cellular/CustomApnEditor.qml (+70/-10) plugins/cellular/PageChooseApn.qml (+4/-28) plugins/cellular/apn.js (+61/-0) |
To merge this branch: | bzr merge lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+254318@code.launchpad.net |
Commit message
[cellular/apn] no creation of custom contexts on editor exit
Description of the change
What changed:
I moved creation of a new, custom internet context to when the user presses "Activate".
Why did I add apn.js:
I want to move the tons of JavaScript code out of the QML and into a nice, documented collection of helper code.
How to test this:
1. $ /usr/share/
2. Open up the APN editor and press "Custom Internet APN"
3. Immediately press Cancel or even "<"
4. Confirm no new contexts were created.
* /var/lib/
To post a comment you must log in.
FAILED: Continuous integration, rev:1359 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/2033/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1998 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- vivid-i386- ci/303 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1759 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1996 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1996/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 19209
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/2033/ rebuild
http://