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 on 2015-06-04
Status: Merged
Approved by: Kunal Parmar on 2015-07-25
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 on 2015-07-25
Nicholas Skaggs Needs Fixing on 2015-07-23
Alan Pope 🍺🐧🐱 🦄 2015-06-04 Needs Fixing on 2015-06-19
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.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Needs Fixing
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
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

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
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

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)
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
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 on 2015-07-25
665. By Kunal Parmar on 2015-07-25

Merge from trunk

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
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: