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
1=== modified file 'src/qml/NewRecipientPage.qml'
2--- src/qml/NewRecipientPage.qml 2016-03-16 18:05:07 +0000
3+++ src/qml/NewRecipientPage.qml 2016-05-16 15:53:55 +0000
4@@ -74,8 +74,23 @@
5
6 Sections {
7 id: headerSections
8- model: [i18n.tr("All"), i18n.tr("Favorites")]
9+ model: contactMap.hasFavorites || (contactList.mostCalledCount > 0) ?
10+ [ i18n.tr("All"), i18n.tr("Favorites") ] : []
11+ onModelChanged: selectedIndex = 0
12+ onSelectedIndexChanged: {
13+ switch (selectedIndex) {
14+ case 0:
15+ contactList.showAllContacts()
16+ break;
17+ case 1:
18+ contactList.showFavoritesContacts()
19+ break;
20+ default:
21+ break;
22+ }
23+ }
24 }
25+
26 TextField {
27 id: searchField
28
29@@ -157,6 +172,10 @@
30 }
31 ]
32
33+ ContactMap {
34+ id: contactMap
35+ }
36+
37 ContactListView {
38 id: contactList
39 objectName: "newRecipientList"
40@@ -213,22 +232,6 @@
41 }
42
43 Connections {
44- target: headerSections
45- onSelectedIndexChanged: {
46- switch (headerSections.selectedIndex) {
47- case 0:
48- contactList.showAllContacts()
49- break;
50- case 1:
51- contactList.showFavoritesContacts()
52- break;
53- default:
54- break;
55- }
56- }
57- }
58-
59- Connections {
60 target: contactList.listModel
61 onContactsChanged: {
62 if (newRecipientPage.contactIndex) {

Subscribers

People subscribed via source and target branches