Merge lp:~savilerow-team/savilerow/unity-scope-selfserviceplan-lp1322337 into lp:~savilerow-team/savilerow/unity-scope-selfserviceplan

Proposed by Scott Sweeny
Status: Merged
Merged at revision: 16
Proposed branch: lp:~savilerow-team/savilerow/unity-scope-selfserviceplan-lp1322337
Merge into: lp:~savilerow-team/savilerow/unity-scope-selfserviceplan
Diff against target: 39 lines (+9/-3)
2 files modified
data/selfserviceplan.json.in (+3/-3)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~savilerow-team/savilerow/unity-scope-selfserviceplan-lp1322337
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+222046@code.launchpad.net

Description of the change

Populate the "link" fields of results with a non-empty string since the API seems to have become more strict lately.

Tested by cwayne on his phone.

To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/selfserviceplan.json.in'
--- data/selfserviceplan.json.in 2014-02-22 05:17:13 +0000
+++ data/selfserviceplan.json.in 2014-06-04 13:48:14 +0000
@@ -3,18 +3,18 @@
3 "title": "Minutes used",3 "title": "Minutes used",
4 "description": "45 of 60",4 "description": "45 of 60",
5 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_phone@27.png",5 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_phone@27.png",
6 "link": ""6 "link": "http://www.ubuntu.com"
7 },7 },
8 {8 {
9 "title": "Messages used",9 "title": "Messages used",
10 "description": "743 of 1000",10 "description": "743 of 1000",
11 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_message@27.png",11 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_message@27.png",
12 "link": ""12 "link": "http://www.ubuntu.com"
13 },13 },
14 {14 {
15 "title": "Data used (MB)",15 "title": "Data used (MB)",
16 "description": "70 out of 100",16 "description": "70 out of 100",
17 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_data@27.png",17 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_data@27.png",
18 "link": ""18 "link": "http://www.ubuntu.com"
19 }19 }
20]20]
2121
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-27 02:27:44 +0000
+++ debian/changelog 2014-06-04 13:48:14 +0000
@@ -1,3 +1,9 @@
1unity-scope-selfserviceplan (0.4) UNRELEASED; urgency=medium
2
3 * Don't use empty URLs for results (LP: #1322337)
4
5 -- Scott Sweeny <scott.sweeny@canonical.com> Wed, 04 Jun 2014 00:37:34 -0400
6
1unity-scope-selfserviceplan (0.3) trusty; urgency=medium7unity-scope-selfserviceplan (0.3) trusty; urgency=medium
28
3 * Update for new api9 * Update for new api

Subscribers

People subscribed via source and target branches

to all changes: