Merge lp:~renatofilho/dialer-app/fix-1558780 into lp:dialer-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 517
Merged at revision: 517
Proposed branch: lp:~renatofilho/dialer-app/fix-1558780
Merge into: lp:dialer-app
Diff against target: 55 lines (+15/-5)
2 files modified
src/qml/ContactViewPage/DialerContactViewPage.qml (+1/-0)
src/qml/dialer-app.qml (+14/-5)
To merge this branch: bzr merge lp:~renatofilho/dialer-app/fix-1558780
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+289435@code.launchpad.net

Commit message

Do not pass null as value for any initial value.

To post a comment you must log in.
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 'src/qml/ContactViewPage/DialerContactViewPage.qml'
2--- src/qml/ContactViewPage/DialerContactViewPage.qml 2016-01-06 18:21:13 +0000
3+++ src/qml/ContactViewPage/DialerContactViewPage.qml 2016-03-17 22:04:25 +0000
4@@ -54,6 +54,7 @@
5 }
6 }
7
8+ model: null
9 headerActions: [
10 Action {
11 objectName: "share"
12
13=== modified file 'src/qml/dialer-app.qml'
14--- src/qml/dialer-app.qml 2015-11-03 13:39:11 +0000
15+++ src/qml/dialer-app.qml 2016-03-17 22:04:25 +0000
16@@ -41,7 +41,7 @@
17 }
18 return numAccounts > 1
19 }
20-
21+
22 property QtObject account: defaultPhoneAccount()
23 property bool greeterMode: (state == "greeterMode")
24 property bool lastHasCalls: callManager.hasCalls
25@@ -211,7 +211,9 @@
26 }
27
28 function viewContact(contact, contactListPage, model) {
29- var initialPropers = {"model": model}
30+ var initialPropers = {}
31+ if (model)
32+ initialPropers["model"] = model
33
34 if (typeof(contact) == 'string') {
35 initialPropers["contactId"] = contact
36@@ -223,9 +225,16 @@
37 }
38
39 function addPhoneToContact(contact, phoneNumber, contactListPage, model) {
40- var initialPropers = {"addPhoneToContact": phoneNumber,
41- "contactListPage": contactListPage,
42- "model": model }
43+ var initialPropers = {}
44+
45+ if (phoneNumber)
46+ initialPropers["addPhoneToContact"] = phoneNumber
47+
48+ if (contactListPage)
49+ initialPropers["contactListPage"] = contactListPage
50+
51+ if (model)
52+ initialPropers["model"] = model
53
54 if (typeof(contact) == 'string') {
55 initialPropers["contactId"] = contact

Subscribers

People subscribed via source and target branches