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
=== modified file 'src/qml/ContactViewPage/DialerContactViewPage.qml'
--- src/qml/ContactViewPage/DialerContactViewPage.qml 2016-01-06 18:21:13 +0000
+++ src/qml/ContactViewPage/DialerContactViewPage.qml 2016-03-17 22:04:25 +0000
@@ -54,6 +54,7 @@
54 }54 }
55 }55 }
5656
57 model: null
57 headerActions: [58 headerActions: [
58 Action {59 Action {
59 objectName: "share"60 objectName: "share"
6061
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml 2015-11-03 13:39:11 +0000
+++ src/qml/dialer-app.qml 2016-03-17 22:04:25 +0000
@@ -41,7 +41,7 @@
41 }41 }
42 return numAccounts > 142 return numAccounts > 1
43 }43 }
44 44
45 property QtObject account: defaultPhoneAccount()45 property QtObject account: defaultPhoneAccount()
46 property bool greeterMode: (state == "greeterMode")46 property bool greeterMode: (state == "greeterMode")
47 property bool lastHasCalls: callManager.hasCalls47 property bool lastHasCalls: callManager.hasCalls
@@ -211,7 +211,9 @@
211 }211 }
212212
213 function viewContact(contact, contactListPage, model) {213 function viewContact(contact, contactListPage, model) {
214 var initialPropers = {"model": model}214 var initialPropers = {}
215 if (model)
216 initialPropers["model"] = model
215217
216 if (typeof(contact) == 'string') {218 if (typeof(contact) == 'string') {
217 initialPropers["contactId"] = contact219 initialPropers["contactId"] = contact
@@ -223,9 +225,16 @@
223 }225 }
224226
225 function addPhoneToContact(contact, phoneNumber, contactListPage, model) {227 function addPhoneToContact(contact, phoneNumber, contactListPage, model) {
226 var initialPropers = {"addPhoneToContact": phoneNumber,228 var initialPropers = {}
227 "contactListPage": contactListPage,229
228 "model": model }230 if (phoneNumber)
231 initialPropers["addPhoneToContact"] = phoneNumber
232
233 if (contactListPage)
234 initialPropers["contactListPage"] = contactListPage
235
236 if (model)
237 initialPropers["model"] = model
229238
230 if (typeof(contact) == 'string') {239 if (typeof(contact) == 'string') {
231 initialPropers["contactId"] = contact240 initialPropers["contactId"] = contact

Subscribers

People subscribed via source and target branches