Merge lp:~pkunal-parmar/ubuntu-calendar-app/EmptyAttendee into lp:ubuntu-calendar-app

Proposed by Kunal Parmar
Status: Merged
Approved by: Mihir Soni
Approved revision: 534
Merged at revision: 534
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/EmptyAttendee
Merge into: lp:ubuntu-calendar-app
Diff against target: 16 lines (+5/-1)
1 file modified
EventDetails.qml (+5/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/EmptyAttendee
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239563@code.launchpad.net

Commit message

Bug #1383830
Empty attendees in event details

Description of the change

Bug #1383830
Empty attendees in event details

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me !

Thanks kunal

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
532. By Kunal Parmar

merge from trunk

533. By Kunal Parmar

bug resolved

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
534. By Kunal Parmar

dummy

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me and Jenkis is passing as well.
Thanks kunal

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventDetails.qml'
2--- EventDetails.qml 2014-10-20 15:20:21 +0000
3+++ EventDetails.qml 2014-11-04 15:03:14 +0000
4@@ -81,7 +81,11 @@
5 contactModel.clear();
6 if( attendees !== undefined ) {
7 for (var j = 0 ; j < attendees.length ; ++j) {
8- contactModel.append( {"name": attendees[j].name,"participationStatus": attendees[j].participationStatus } );
9+ var name = attendees[j].name.trim().length === 0 ?
10+ attendees[j].emailAddress.replace("mailto:", ""):
11+ attendees[j].name
12+
13+ contactModel.append( {"name": name,"participationStatus": attendees[j].participationStatus } );
14 }
15 }
16 }

Subscribers

People subscribed via source and target branches

to status/vote changes: