Merge lp:~renatofilho/address-book-app/fix-1227696 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Avoid show "undefined" for empty names.

[lp:~renatofilho/address-book-app/fix-1227696]

82. By Renato Araujo Oliveira Filho on 2013-09-26

Share share "formatToDisplay" function with different components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/180
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1661
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1403

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/179/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good now.
Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4154
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1413

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/180/rebuild

review: Approve (continuous-integration)

=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2013-09-11 16:50:38 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2013-09-26 14:39:22 +0000
@@ -5,6 +5,7 @@
     ContactDetailPickerDelegate.qml
     ContactDetailPickerPhoneNumberDelegate.qml
     ContactListView.qml
+    Contacts.js
     ContactSearchListView.qml
     ContactSimpleListView.qml
     DialogButtons.qml

=== modified file 'src/imports/Ubuntu/Contacts/ContactSearchListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSearchListView.qml	2013-09-10 22:17:49 +0000
+++ src/imports/Ubuntu/Contacts/ContactSearchListView.qml	2013-09-26 14:39:22 +0000
@@ -18,6 +18,8 @@
 import QtContacts 5.0
 import Ubuntu.Components 0.1
 
+import "Contacts.js" as ContactsJS
+
 /*!
     \qmltype ContactSearchListView
     \inqmlmodule Ubuntu.Contacts 0.1
@@ -125,28 +127,6 @@
     */
     signal detailClicked(QtObject contact, QtObject detail)
 
-    function formatToDisplay(contact, contactDetail, detailFields, detail) {
-        if (!contact) {
-            return ""
-        }
-
-        if (!detail) {
-            detail = contact.detail(contactDetail)
-        }
-
-        var values = ""
-        for (var i=0; i < detailFields.length; i++) {
-            if (i > 0 && detail) {
-                values += " "
-            }
-            if (detail) {
-                values +=  detail.value(detailFields[i])
-            }
-        }
-
-        return values
-    }
-
     clip: true
     snapMode: ListView.NoSnap
     orientation: ListView.Horizontal
@@ -258,7 +238,7 @@
                         }
                         height: units.gu(2.5)
                         verticalAlignment: Text.AlignVCenter
-                        text: formatToDisplay(contact, titleDetail, titleFields)
+                        text: ContactsJS.formatToDisplay(contact, titleDetail, titleFields)
                         elide: Text.ElideRight
                         color: "white"
                         fontSize: "medium"
@@ -274,7 +254,7 @@
                         }
                         height: units.gu(1)
                         verticalAlignment:  Text.AlignVCenter
-                        text: modelData === "" ? modelData : formatToDisplay(contact, detailToPick, detailFieldsToDisplay, modelData)
+                        text: modelData === "" ? modelData : ContactsJS.formatToDisplay(contact, detailToPick, detailFieldsToDisplay, modelData)
                         elide: Text.ElideRight
                         fontSize: "x-small"
                         color: "white"

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-09-23 20:31:07 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-09-26 14:39:22 +0000
@@ -21,6 +21,8 @@
 import Ubuntu.Telephony 0.1
 
 import "ContactList.js" as Sections
+import "Contacts.js" as ContactsJS
+
 
 /*!
     \qmltype ContactSimpleListView
@@ -208,28 +210,6 @@
         }
     }
 
-    function formatToDisplay(contact, contactDetail, detailFields) {
-        if (!contact) {
-            return ""
-        }
-
-        var detail = contact.detail(contactDetail)
-        var values = ""
-        for (var i=0; i < detailFields.length; i++) {
-            if (i > 0 && detail) {
-                values += " "
-            }
-            if (detail) {
-                var value = detail.value(detailFields[i])
-                if (value !== undefined) {
-                    values += value
-                }
-            }
-        }
-
-        return values
-    }
-
     clip: true
     snapMode: ListView.SnapToItem
     section {
@@ -366,13 +346,13 @@
                     Label {
                         id: name
                         height: paintedHeight
-                        text: contactListView.formatToDisplay(contact, contactListView.titleDetail, contactListView.titleFields)
+                        text: ContactsJS.formatToDisplay(contact, contactListView.titleDetail, contactListView.titleFields)
                         fontSize: "large"
                     }
                     Label {
                         id: company
                         height: paintedHeight
-                        text: contactListView.formatToDisplay(contact, contactListView.subTitleDetail, contactListView.subTitleFields)
+                        text: ContactsJS.formatToDisplay(contact, contactListView.subTitleDetail, contactListView.subTitleFields)
                         fontSize: "medium"
                         opacity: 0.2
                     }

=== added file 'src/imports/Ubuntu/Contacts/Contacts.js'
--- src/imports/Ubuntu/Contacts/Contacts.js	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/Contacts.js	2013-09-26 14:39:22 +0000
@@ -0,0 +1,25 @@
+// Format contact name to be displayed
+function formatToDisplay(contact, contactDetail, detailFields, detail) {
+    if (!contact) {
+        return ""
+    }
+
+    if (!detail) {
+        detail = contact.detail(contactDetail)
+    }
+
+    var values = ""
+    for (var i=0; i < detailFields.length; i++) {
+        if (detail) {
+            var value = detail.value(detailFields[i]);
+            if (value) {
+                if (i > 0 && detail) {
+                    values += " "
+                }
+                values += value;
+            }
+        }
+    }
+
+    return values
+}