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
1=== modified file 'data/selfserviceplan.json.in'
2--- data/selfserviceplan.json.in 2014-02-22 05:17:13 +0000
3+++ data/selfserviceplan.json.in 2014-06-04 13:48:14 +0000
4@@ -3,18 +3,18 @@
5 "title": "Minutes used",
6 "description": "45 of 60",
7 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_phone@27.png",
8- "link": ""
9+ "link": "http://www.ubuntu.com"
10 },
11 {
12 "title": "Messages used",
13 "description": "743 of 1000",
14 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_message@27.png",
15- "link": ""
16+ "link": "http://www.ubuntu.com"
17 },
18 {
19 "title": "Data used (MB)",
20 "description": "70 out of 100",
21 "image": "file://${SCOPE_INSTALL_DIR}/icons/icon_data@27.png",
22- "link": ""
23+ "link": "http://www.ubuntu.com"
24 }
25 ]
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2014-03-27 02:27:44 +0000
29+++ debian/changelog 2014-06-04 13:48:14 +0000
30@@ -1,3 +1,9 @@
31+unity-scope-selfserviceplan (0.4) UNRELEASED; urgency=medium
32+
33+ * Don't use empty URLs for results (LP: #1322337)
34+
35+ -- Scott Sweeny <scott.sweeny@canonical.com> Wed, 04 Jun 2014 00:37:34 -0400
36+
37 unity-scope-selfserviceplan (0.3) trusty; urgency=medium
38
39 * Update for new api

Subscribers

People subscribed via source and target branches

to all changes: