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

[Renato Araujo Oliveira Filho]

Cancel contact view/edit if contact removed from contact list.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3319
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/852
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/719

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-08-28 17:06:38 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-09-11 22:41:24 +0000
@@ -199,6 +199,13 @@
         onContactsChanged: {
             if (saving) {
                 pageStack.pop()
+            } else if (contactEditor.contact) {
+                for (var i=0; i < contactEditor.model.contacts.length; i++) {
+                    if (contactEditor.model.contacts[i].contactId == contactEditor.contact.contactId) {
+                        return
+                    }
+                }
+                pageStack.pop()
             }
         }
 

=== modified file 'src/imports/ContactView/ContactFetch.qml'
--- src/imports/ContactView/ContactFetch.qml	2013-07-08 18:35:17 +0000
+++ src/imports/ContactView/ContactFetch.qml	2013-09-11 22:41:24 +0000
@@ -25,6 +25,7 @@
     property bool contactIsDirty: false
 
     signal contactFetched(QtObject contact)
+    signal contactRemoved()
 
     function fetchContact(contactId) {
         if (contact && !contactIsDirty) {
@@ -44,6 +45,13 @@
         onContactsChanged: {
             if (root.contact) {
                 root.contactIsDirty = true
+
+                for (var i=0; i < root.model.contacts.length; i++) {
+                    if (root.model.contacts[i].contactId == root.contact.contactId) {
+                        return
+                    }
+                }
+                contactRemoved()
             }
         }
     }

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2013-08-28 17:06:38 +0000
+++ src/imports/ContactView/ContactView.qml	2013-09-11 22:41:24 +0000
@@ -130,6 +130,8 @@
 
     ContactFetch {
         id: contactFetch
+
+        onContactRemoved: pageStack.pop()
     }
 
     tools: ToolbarItems {