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

[Renato Araujo Oliveira Filho]

Does not focus contact first name when opening contact edit view.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/509/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4908
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5053
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5053/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

* Are there any related MPs required for this MP to build/function as expected? NO
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): YES
* Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES
* Did you successfully run all tests found in your component's Test Plan on device or emulator? YES
* If you changed the UI, was the change specified/approved by design? N/A
* If you changed the packaging (debian), did you subscribe a core-dev to this MP? N/A

[Tiago Salem Herrmann (tiagosh)]

Looks good to me.

-------------

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

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

168. By Renato Araujo Oliveira Filho on 2014-05-02

Merged trunk.

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-04-16 14:29:23 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-05-02 18:14:15 +0000
@@ -27,6 +27,7 @@
 
     property QtObject contact: null
     property alias model: contactFetch.model
+    readonly property  bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
 
     // this is used to add a phone number to a existing contact
     property string contactId: ""
@@ -63,7 +64,7 @@
 
         // new contact and there is only two details (name, avatar)
         // name and avatar, are not removable details, because of that the contact will have at least 2 details
-        if ((contact.contactId === "qtcontacts:::") &&
+        if (isNewContact &&
             (contact.contactDetails.length === 2)) {
 
             // if name is empty this means that the contact is empty
@@ -329,7 +330,8 @@
     Component.onCompleted: {
         if (contactId !== "") {
             contactFetch.fetchContact(contactId)
+        } else if (isNewContact) {
+            nameEditor.forceActiveFocus()
         }
-        nameEditor.forceActiveFocus()
     }
 }