Ubuntu Calendar App

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

  1. ReadOnlyCal
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Kunal Parmar
Approved revision: 665
Merged at revision: 700
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal
Merge into: lp:ubuntu-calendar-app
Diff against target: 59 lines (+21/-1)
3 files modified
EventDetails.qml (+6/-0)
EventListModel.qml (+14/-0)
NewEvent.qml (+1/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs (community) Needs Fixing
Alan Pope 🍺🐧🐱 🦄 (community) Needs Fixing
Review via email: mp+261075@code.launchpad.net

Commit message

resolves bug #1347836

Description of the change

resolves bug #1347836

Events saved to birthdays calendar don't appear in timeline

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:661
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1188/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2894
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2894/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/659
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/185

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1188/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:661
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1198/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2960
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2960/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/669
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/195

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1198/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

Just so that I don't forget.

We need to see how this behave in case of Edit event case

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:663
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1204/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3013
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3013/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/675
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/201

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1204/rebuild

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

FAILED: Continuous integration, rev:664
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1205/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3014
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/676
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/202

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1205/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

so I added debug logs to analyse the issue, it seems the patch from EDS is not available or installed in jenkins.

which is why calendar is not able to read extended property("collection-readonly") from EDS and test cases are failing.

qml: Personal ---- undefined
qml: Personal ---- undefined
qml: Birthdays & Anniversaries ---- undefined
qml: Personal ---- undefined

for this MR to pass jenkins, following MR should be available.

https://code.launchpad.net/~renatofilho/qtorganizer5-eds/fix-1347836/+merge/255726

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/543/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/116/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Text conflict in EventDetails.qml
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

Jenkins is set to merge this once it's fixed.

review: Needs Fixing
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> Text conflict in EventDetails.qml
> 1 conflicts encountered.
> bzr: ERROR: Conflicts from merge
>
>
> Jenkins is set to merge this once it's fixed.

Thanks nick, I will do the needful

lp:~pkunal-parmar/ubuntu-calendar-app/ReadOnlyCal updated
665. By Kunal Parmar

Merge from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:665
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1218/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/215

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1218/rebuild

review: Approve (continuous-integration)

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 2015-06-27 17:52:44 +0000
3+++ EventDetails.qml 2015-07-25 04:52:44 +0000
4@@ -59,11 +59,17 @@
5 }
6
7 function updateCollection(event) {
8+
9 var collection = model.collection( event.collectionId );
10 calendarIndicator.color = collection.color
11 eventInfo.color=collection.color
12 // TRANSLATORS: the first parameter refers to the name of event calendar.
13 calendarName.text = i18n.tr("%1 Calendar").arg( collection.name)
14+
15+ //disable edit in case of read only calendar
16+ if( collection.extendedMetaData("collection-readonly") === true ) {
17+ editAction.enabled = false
18+ }
19 }
20
21 function updateRecurrence( event ) {
22
23=== modified file 'EventListModel.qml'
24--- EventListModel.qml 2015-05-14 13:03:02 +0000
25+++ EventListModel.qml 2015-07-25 04:52:44 +0000
26@@ -77,6 +77,20 @@
27 return cals;
28 }
29
30+ function getWritableCollections(){
31+ var cals = [];
32+ var collections = eventModel.collections;
33+ for(var i = 0 ; i < collections.length ; ++i) {
34+ var cal = collections[i];
35+ print(cal.name + " ---- " + cal.extendedMetaData("collection-readonly"));
36+ if( cal.extendedMetaData("collection-type") === "Calendar" &&
37+ cal.extendedMetaData("collection-readonly") === false ) {
38+ cals.push(cal);
39+ }
40+ }
41+ return cals;
42+ }
43+
44 onStartPeriodChanged: {
45 isLoading = true
46 }
47
48=== modified file 'NewEvent.qml'
49--- NewEvent.qml 2015-06-27 17:52:44 +0000
50+++ NewEvent.qml 2015-07-25 04:52:44 +0000
51@@ -505,7 +505,7 @@
52 }
53
54 containerHeight: itemHeight * 4
55- model: root.model.getCollections();
56+ model: root.model.getWritableCollections();
57
58 delegate: OptionSelectorDelegate{
59 text: modelData.name

Subscribers

People subscribed via source and target branches

to status/vote changes: