Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract CLASS property from calendar object and store it in the database #24080

Merged
merged 6 commits into from
Jun 10, 2016
Merged

Extract CLASS property from calendar object and store it in the database #24080

merged 6 commits into from
Jun 10, 2016

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Apr 19, 2016 •
edited
Loading

fixes #22914

@georgehrke mind testing and adjusting the calendar?

@PVince81 @dragotin @icewind1991 mind reviewing

@melo1 @stefangweichinger @p5n @tagru @sameliotfischer since you voted for this feature please test

THX

@DeepDiver1975 DeepDiver1975 added this to the 9.1-current milestone Apr 19, 2016
@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @schiesbn, @nickvergessen, @LukasReschke and @DeepDiver1975 to be potential reviewers

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch 2 times, most recently from d2ed5cf to a20577d Compare April 21, 2016 10:42
@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch from a20577d to bb5fdb1 Compare May 30, 2016 12:00
@PVince81
Copy link
Contributor

@DeepDiver1975 9.2 or bugfix for 9.1 ?

@georgehrke
Copy link
Contributor

9.1 would be appreciated

@DeepDiver1975 DeepDiver1975 self-assigned this May 30, 2016
nickvergessen
nickvergessen reviewed May 30, 2016
View reviewed changes
apps/dav/lib/migration/classification.php
@@ -0,0 +1,41 @@
<?php

namespace OCA\DAV\Migration;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing license

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch 2 times, most recently from 4217214 to 28afdaa Compare May 31, 2016 15:36
@DeepDiver1975 DeepDiver1975 changed the title [WIP] Extract CLASS property from calendar object and store it in the database Extract CLASS property from calendar object and store it in the database Jun 2, 2016
rullzer
rullzer reviewed Jun 3, 2016
View reviewed changes
.htaccess
#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####

ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

used git commit -a 😉 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DeepDiver1975 can you remove this file ?

@PVince81
Copy link
Contributor

PVince81 commented Jun 7, 2016

@georgehrke can you review the remaining code ?

@georgehrke
Copy link
Contributor

Code looks good, will test with and adjust the calendar.

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch from 3a9b3ff to 82b31ea Compare June 7, 2016 08:35
@georgehrke
Copy link
Contributor

The logic for Private and Confidential seems to be mixed up.
Should be the opposite according to: http://wiki.davical.org/w/Features#Handle_Private_Events
My list in #22914 was wrong, I'm sorry for that.

georgehrke
georgehrke reviewed Jun 7, 2016
View reviewed changes
apps/dav/lib/CalDAV/CalendarObject.php
* @param string $calData
* @return string
*/
public static function cleanByAccessClass($calData) {
Copy link
Contributor

@georgehrke georgehrke Jun 7, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

method name is confusing, because there is no access class given as a parameter

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch from 82b31ea to 155110f Compare June 7, 2016 10:16
@DeepDiver1975
Copy link
Member Author

@georgehrke addressed - thanks for the review! Is there a calendar branch implementing the classification? THX

@georgehrke
Copy link
Contributor

owncloud/calendar#567

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch from 155110f to a6fd90a Compare June 7, 2016 15:14
@georgehrke
Copy link
Contributor

looks good now 👍

georgehrke
georgehrke reviewed Jun 9, 2016
View reviewed changes
apps/dav/appinfo/database.xml
@@ -272,6 +272,12 @@ CREATE TABLE calendarobjects (
<type>text</type>
<length>255</length>
</field>
<field>
<comments>0 - private, 1 - public, 2 - confidential</comments>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't match with the numbers in CalDavBackend though

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

public is 0

@DeepDiver1975 DeepDiver1975 force-pushed the support-calendar-class-property branch from a6fd90a to bfcd1dc Compare June 9, 2016 09:09
@DeepDiver1975
Copy link
Member Author

THX @georgehrke for testing and review

@dragotin @guruz @nickvergessen @icewind1991 mind testing? THX

@stefangweichinger
Copy link

sorry for not yet testing: customer is scared to try fixes in prod ...
thanks for your patches.

@PVince81
Copy link
Contributor

👍

@PVince81 PVince81 merged commit 68c3b23 into master Jun 10, 2016
@PVince81 PVince81 deleted the support-calendar-class-property branch June 10, 2016 09:22
@PVince81
Copy link
Contributor

@DeepDiver1975 does this need backport ? The original ticket talks about 9.0

CC @dragotin

@DeepDiver1975
Copy link
Member Author

Because database migration is involved I would not do a backport

@PVince81
Copy link
Contributor

Ok, agreed

@lock
Copy link

lock bot commented Aug 5, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@DeepDiver1975 DeepDiver1975

Labels
3 - To Review
Projects
None yet
Milestone
9.1
Development

Successfully merging this pull request may close these issues.

support CLASS property when sharing objects via CALDAV
7 participants
@DeepDiver1975 @mention-bot @PVince81 @georgehrke @stefangweichinger @rullzer @nickvergessen