Merge lp:~renatofilho/messaging-app/fix-1489330 into lp:messaging-app

Proposed by Renato Araujo Oliveira Filho
Status: Approved
Approved by: Gustavo Pichorim Boiko
Approved revision: 465
Proposed branch: lp:~renatofilho/messaging-app/fix-1489330
Merge into: lp:messaging-app
Diff against target: 62 lines (+20/-17)
1 file modified
src/qml/NewRecipientPage.qml (+20/-17)
To merge this branch: bzr merge lp:~renatofilho/messaging-app/fix-1489330
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+276132@code.launchpad.net

Commit message

Only show favorite sections if the list contains favorite contacts.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
460. By Renato Araujo Oliveira Filho

Trunk merged.

461. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
462. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
463. By Renato Araujo Oliveira Filho

Update NewRecipientPage to use the new ContactMap component.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
464. By Renato Araujo Oliveira Filho

Move back to 'all' contacts if the 'favorite' list is empty.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
465. By Renato Araujo Oliveira Filho

Show favorite section if the most called model is not empty.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve
466. By Renato Araujo Oliveira Filho

Trunk merged.

467. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:467
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/755/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/755
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/702
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/702
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/702
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/694/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/694/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/694/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/694/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/694/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/694/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/694/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/694/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/694
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/694/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/28/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

467. By Renato Araujo Oliveira Filho

Trunk merged.

466. By Renato Araujo Oliveira Filho

Trunk merged.

465. By Renato Araujo Oliveira Filho

Show favorite section if the most called model is not empty.

464. By Renato Araujo Oliveira Filho

Move back to 'all' contacts if the 'favorite' list is empty.

463. By Renato Araujo Oliveira Filho

Update NewRecipientPage to use the new ContactMap component.

462. By Renato Araujo Oliveira Filho

Trunk merged.

461. By Renato Araujo Oliveira Filho

Trunk merged.

460. By Renato Araujo Oliveira Filho

Trunk merged.

459. By Renato Araujo Oliveira Filho

Only show favorite sections if the list contains favorite contacts.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/NewRecipientPage.qml'
--- src/qml/NewRecipientPage.qml 2016-03-16 18:05:07 +0000
+++ src/qml/NewRecipientPage.qml 2016-05-16 15:53:55 +0000
@@ -74,8 +74,23 @@
7474
75 Sections {75 Sections {
76 id: headerSections76 id: headerSections
77 model: [i18n.tr("All"), i18n.tr("Favorites")]77 model: contactMap.hasFavorites || (contactList.mostCalledCount > 0) ?
78 [ i18n.tr("All"), i18n.tr("Favorites") ] : []
79 onModelChanged: selectedIndex = 0
80 onSelectedIndexChanged: {
81 switch (selectedIndex) {
82 case 0:
83 contactList.showAllContacts()
84 break;
85 case 1:
86 contactList.showFavoritesContacts()
87 break;
88 default:
89 break;
90 }
91 }
78 }92 }
93
79 TextField {94 TextField {
80 id: searchField95 id: searchField
8196
@@ -157,6 +172,10 @@
157 }172 }
158 ]173 ]
159174
175 ContactMap {
176 id: contactMap
177 }
178
160 ContactListView {179 ContactListView {
161 id: contactList180 id: contactList
162 objectName: "newRecipientList"181 objectName: "newRecipientList"
@@ -213,22 +232,6 @@
213 }232 }
214233
215 Connections {234 Connections {
216 target: headerSections
217 onSelectedIndexChanged: {
218 switch (headerSections.selectedIndex) {
219 case 0:
220 contactList.showAllContacts()
221 break;
222 case 1:
223 contactList.showFavoritesContacts()
224 break;
225 default:
226 break;
227 }
228 }
229 }
230
231 Connections {
232 target: contactList.listModel235 target: contactList.listModel
233 onContactsChanged: {236 onContactsChanged: {
234 if (newRecipientPage.contactIndex) {237 if (newRecipientPage.contactIndex) {

Subscribers

People subscribed via source and target branches