Ubuntu Silo Installer

Merge lp:~robru/ubuntu-silo-installer/bileto-v2 into lp:ubuntu-silo-installer

  1. bileto-v2
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 99
Proposed branch: lp:~robru/ubuntu-silo-installer/bileto-v2
Merge into: lp:ubuntu-silo-installer
Diff against target: 67 lines (+11/-11)
4 files modified
UbuntuSiloInstaller/AllSilosPage.qml (+3/-3)
UbuntuSiloInstaller/ProjectSilosPage.qml (+2/-2)
UbuntuSiloInstaller/ProjectsPage.qml (+3/-3)
UbuntuSiloInstaller/RequestInstaller.qml (+3/-3)
To merge this branch: bzr merge lp:~robru/ubuntu-silo-installer/bileto-v2
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Ubuntu Phablet Team Pending
Review via email: mp+309884@code.launchpad.net

Description of the change

Bileto V2 API with a slight change.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UbuntuSiloInstaller/AllSilosPage.qml'
2--- UbuntuSiloInstaller/AllSilosPage.qml 2016-11-02 13:26:40 +0000
3+++ UbuntuSiloInstaller/AllSilosPage.qml 2016-11-02 18:23:40 +0000
4@@ -65,10 +65,10 @@
5 id: silosDelegateModel
6
7 property var silosModel: JSONListModel {
8- source: "https://bileto.ubuntu.com/v1/tickets"
9- // select requests that have source packages built if any
10+ source: "https://bileto.ubuntu.com/v2/tickets"
11+ // select tickets that have source packages built if any
12 // or at least download links that we assume to be click packages
13- query: "$.requests[?(@.download_links.indexOf('.click') != -1 && @.sources == '' \
14+ query: "$.tickets[?(@.download_links.indexOf('.click') != -1 && @.sources == '' \
15 || @.sources != ''%1%2)]".arg(allSilosPage.installableOnly ? " && @.status.indexOf('Successfully built') == 0" : "")
16 .arg(" && @.sources.indexOf('%1') == 0".arg(searchHeader.contents.text.toLowerCase().trim()))
17
18
19=== modified file 'UbuntuSiloInstaller/ProjectSilosPage.qml'
20--- UbuntuSiloInstaller/ProjectSilosPage.qml 2016-11-02 13:26:40 +0000
21+++ UbuntuSiloInstaller/ProjectSilosPage.qml 2016-11-02 18:23:40 +0000
22@@ -43,8 +43,8 @@
23
24 JSONListModel {
25 id: silosModel
26- source: "https://bileto.ubuntu.com/v1/tickets"
27- query: "$.requests[?(@.sources.indexOf('%1') !=-1)]".arg(projectSilosPage.projectName)
28+ source: "https://bileto.ubuntu.com/v2/tickets"
29+ query: "$.tickets[?(@.sources.indexOf('%1') !=-1)]".arg(projectSilosPage.projectName)
30 }
31 model: silosModel.model
32 currentIndex: -1
33
34=== modified file 'UbuntuSiloInstaller/ProjectsPage.qml'
35--- UbuntuSiloInstaller/ProjectsPage.qml 2016-09-26 12:44:36 +0000
36+++ UbuntuSiloInstaller/ProjectsPage.qml 2016-11-02 18:23:40 +0000
37@@ -65,10 +65,10 @@
38 id: projectsDelegateModel
39
40 property var projectsModel: JSONListModel {
41- source: "https://bileto.ubuntu.com/v1/tickets"
42- // select requests that have source packages built if any
43+ source: "https://bileto.ubuntu.com/v2/tickets"
44+ // select tickets that have source packages built if any
45 // or at least download links that we assume to be click packages
46- query: "$.requests[?(@.download_links.indexOf('.click') != -1 && @.sources == '' \
47+ query: "$.tickets[?(@.download_links.indexOf('.click') != -1 && @.sources == '' \
48 || @.sources != ''%1%2)].sources".arg(projectsPage.installableOnly ? " && @.status.indexOf('Successfully built') == 0" : "")
49 .arg(" && @.sources.indexOf('%1') == 0".arg(searchHeader.contents.text.toLowerCase().trim()))
50
51
52=== modified file 'UbuntuSiloInstaller/RequestInstaller.qml'
53--- UbuntuSiloInstaller/RequestInstaller.qml 2016-11-02 13:26:40 +0000
54+++ UbuntuSiloInstaller/RequestInstaller.qml 2016-11-02 18:23:40 +0000
55@@ -29,9 +29,9 @@
56 }
57
58 property var siloModel: JSONListModel {
59- source: requestId ? "https://bileto.ubuntu.com/v1/ticket/%1".arg(requestId) : ""
60- //query: "$.requests[?(@.sources.indexOf('%1') !=-1)]".arg(project)
61- query: "$.requests"
62+ source: requestId ? "https://bileto.ubuntu.com/v2/ticket/%1".arg(requestId) : ""
63+ //query: "$.tickets[?(@.sources.indexOf('%1') !=-1)]".arg(project)
64+ query: "$.tickets"
65
66 Connections {
67 target: Qt.application

Subscribers

People subscribed via source and target branches