[fedocal] master: Revert "Test commit 2" (1ef5959)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 1ef595940e61731ba07c1be4d56e49f6f803e29e
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Jan 28 20:38:32 2013 +0100
Revert "Test commit 2"
This reverts commit c8efdec9748a9323181dd435dfe609dfcab5d377.
Fixes #26
>---------------------------------------------------------------
README.rst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/README.rst b/README.rst
index f3b3874..53651c2 100644
--- a/README.rst
+++ b/README.rst
@@ -102,3 +102,4 @@ License:
--------
This project is licensed GPLv3+.
+
11 years, 1 month
[fedocal] master: Revert "Test commit #3" (d3b62fb)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit d3b62fbd8cce26f9cde110e1b30f9113d935ed68
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Jan 28 20:37:14 2013 +0100
Revert "Test commit #3"
This reverts commit 7c32ac9e4a25471e835d7a2c49a0ecb93f0bb23b.
Fixes #26
>---------------------------------------------------------------
README.rst | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/README.rst b/README.rst
index 53651c2..f3b3874 100644
--- a/README.rst
+++ b/README.rst
@@ -102,4 +102,3 @@ License:
--------
This project is licensed GPLv3+.
-
11 years, 1 month
[fedocal] master: Test commit #3 (7c32ac9)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 7c32ac9e4a25471e835d7a2c49a0ecb93f0bb23b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Jan 20 21:25:19 2013 +0100
Test commit #3
Fixes #26
>---------------------------------------------------------------
README.rst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/README.rst b/README.rst
index f3b3874..53651c2 100644
--- a/README.rst
+++ b/README.rst
@@ -102,3 +102,4 @@ License:
--------
This project is licensed GPLv3+.
+
11 years, 1 month
[fedocal] master: Test commit 2 (c8efdec)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit c8efdec9748a9323181dd435dfe609dfcab5d377
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Jan 20 21:15:14 2013 +0100
Test commit 2
Fixes #26
>---------------------------------------------------------------
README.rst | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/README.rst b/README.rst
index 53651c2..f3b3874 100644
--- a/README.rst
+++ b/README.rst
@@ -102,4 +102,3 @@ License:
--------
This project is licensed GPLv3+.
-
11 years, 2 months
[fedocal] master: Test commit (f5e893a)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit f5e893a5ed802f8d3000ff2eabc64ba09eeb5ba0
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sat Jan 19 15:59:22 2013 +0100
Test commit
This is a test commit to fix the ticket 3622
Fixes #26
>---------------------------------------------------------------
README.rst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/README.rst b/README.rst
index f3b3874..53651c2 100644
--- a/README.rst
+++ b/README.rst
@@ -102,3 +102,4 @@ License:
--------
This project is licensed GPLv3+.
+
11 years, 2 months
[fedocal] master: Fix tests (52daedb)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 52daedb9778ab47d1a16d983515735c091cc696f
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sat Jan 19 00:27:44 2013 +0100
Fix tests
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 3a18f43..6b1d71e 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -262,7 +262,7 @@ class Fedocallibtests(Modeltests):
meeting_time))
meeting_time = datetime.utcnow() - timedelta(hours=1)
- self.assertFalse(fedocallib.is_date_in_future(meeting_date,
+ self.assertFalse(fedocallib.is_date_in_future(meeting_time.date(),
meeting_time))
meeting_date = date.today() + timedelta(days=1)
@@ -270,7 +270,7 @@ class Fedocallibtests(Modeltests):
self.assertTrue(fedocallib.is_date_in_future(meeting_date,
meeting_time))
- meeting_date = date.today() - timedelta(days=1)
+ meeting_date = date.today() - timedelta(days=2)
self.assertFalse(fedocallib.is_date_in_future(meeting_date,
meeting_time))
@@ -931,7 +931,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), 'pingou',
'Information2', 'EMEA', 'Europe/Paris',
None, None,
@@ -946,7 +946,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(23, 0), time(23, 59), None,
'Information', 'EMEA', 'Europe/Paris',
None, None,
@@ -963,7 +963,7 @@ class Fedocallibtests(Modeltests):
fedocallib.edit_meeting(
self.session, meeting, calendarobj, fasuser,
'Fedora-fr-meeting_edited2',
- TODAY + timedelta(days=1), None,
+ date.today() + timedelta(days=1), None,
time(22, 0), time(23, 0), None,
'Information', 'EMEA', 'Europe/Paris',
7, TODAY + timedelta(days=30),
11 years, 2 months
[fedocal] master: Fix the copy of Meeting object (64785bc)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 64785bcd4023341b55155663f018296337bbd101
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Jan 18 23:54:54 2013 +0100
Fix the copy of Meeting object
>---------------------------------------------------------------
fedocal/fedocallib/model.py | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/fedocal/fedocallib/model.py b/fedocal/fedocallib/model.py
index ddaf773..e5aefee 100644
--- a/fedocal/fedocallib/model.py
+++ b/fedocal/fedocallib/model.py
@@ -251,16 +251,25 @@ class Meeting(BASE):
meeting.recursion_ends = self.recursion_ends
meeting.full_day = self.full_day
else:
- meeting = Meeting(self.meeting_name, self.meeting_manager,
- self.meeting_date, self.meeting_date_end,
- self.meeting_time_start, self.meeting_time_stop,
- self.meeting_information,
- self.calendar_name,
- self.reminder_id,
- self.meeting_region,
- self.recursion_frequency,
- self.recursion_ends,
- self.full_day)
+ meeting = Meeting(
+ meeting_name=self.meeting_name,
+ meeting_manager=self.meeting_manager,
+ meeting_date=self.meeting_date,
+ meeting_date_end=self.meeting_date_end,
+ meeting_time_start=self.meeting_time_start,
+ meeting_time_stop=self.meeting_time_stop,
+ meeting_information=self.meeting_information,
+ calendar_name=self.calendar_name,
+ reminder_id=self.reminder_id,
+ meeting_region=self.meeting_region,
+ recursion_frequency=self.recursion_frequency,
+ recursion_ends=self.recursion_ends,
+ full_day=self.full_day
+ )
+ # Update object associated to the meeting
+ meeting.reminder = self.reminder
+ meeting.calendar = self.calendar
+ meeting.reminder = self.reminder
return meeting
@classmethod
11 years, 2 months
[fedocal] master: Code layout fixes (856f225)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 856f2259f4f174a7433fbffae058b44d9ecd38e9
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Jan 18 23:34:45 2013 +0100
Code layout fixes
>---------------------------------------------------------------
fedocal/__init__.py | 12 ++++++------
fedocal/fedocallib/__init__.py | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 1ba4b2f..bf79ee6 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -411,7 +411,7 @@ def edit_meeting(meeting_id):
return flask.redirect(flask.url_for('index'))
if not flask.g.fas_user.username in \
Meeting.get_managers(SESSION, meeting_id):
- flask.flash('You are not one of the manager of this meeting, '\
+ flask.flash('You are not one of the manager of this meeting, '
'you are not allowed to edit it.')
return flask.redirect(flask.url_for('index'))
meeting = Meeting.by_id(SESSION, meeting_id)
@@ -446,7 +446,7 @@ def edit_meeting(meeting_id):
tzone=tzone)
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_meeting:', err
+ print 'edit_meeting:', err
flask.flash('Could not update this meeting.')
return flask.render_template('edit_meeting.html',
meeting=meeting, calendar=calendarobj, form=form,
@@ -470,7 +470,7 @@ def edit_meeting(meeting_id):
meeting = meetingobj
if not fedocallib.is_date_in_future(meeting.meeting_date,
meeting.meeting_time_start):
- flask.flash('This meeting has already occured, you may not '\
+ flask.flash('This meeting has already occured, you may not '
'change it anymore')
return flask.redirect(flask.url_for('my_meetings'))
form = forms.AddMeetingForm(meeting=meeting, tzone=get_timezone())
@@ -528,7 +528,7 @@ def delete_meeting(meeting_id):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_meeting:', err
+ print 'edit_meeting:', err
flask.flash('Could not update this meeting.')
flask.flash('Meeting deleted')
return flask.redirect(flask.url_for('calendar',
@@ -559,7 +559,7 @@ def delete_calendar(calendar_name):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'delete_calendar:', err
+ print 'delete_calendar:', err
flask.flash('Could not delete this calendar.')
flask.flash('Calendar deleted')
return flask.redirect(flask.url_for('index'))
@@ -596,7 +596,7 @@ def edit_calendar(calendar_name):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_calendar:', err
+ print 'edit_calendar:', err
flask.flash('Could not update this calendar.')
return flask.render_template('edit_calendar.html', form=form,
calendar=calendarobj)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index e4a6542..cffbc4c 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -681,11 +681,11 @@ def add_meeting(session, calendarobj, fas_user,
"""
if not is_user_managing_in_calendar(session,
calendarobj.calendar_name, fas_user):
- raise UserNotAllowed('You are not allowed to add'\
+ raise UserNotAllowed('You are not allowed to add'
' a meeting to this calendar')
if not is_date_in_future(meeting_date, meeting_time_start):
- raise InvalidMeeting('The date you entered is in '\
+ raise InvalidMeeting('The date you entered is in '
'the past')
if meeting_time_start > meeting_time_stop:
@@ -759,7 +759,7 @@ def add_meeting(session, calendarobj, fas_user,
def edit_meeting(session, meeting, calendarobj, fas_user,
- meeting_name, meeting_date, meeting_date_end,
+ meeting_name, meeting_date, meeting_date_end,
meeting_time_start, meeting_time_stop, comanager,
meeting_information,
meeting_region, tzone,
@@ -772,11 +772,11 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
"""
if not is_user_managing_in_calendar(session,
calendarobj.calendar_name, fas_user):
- raise UserNotAllowed('You are not allowed to add'\
+ raise UserNotAllowed('You are not allowed to add'
' a meeting to this calendar')
if not is_date_in_future(meeting_date, meeting_time_start):
- raise InvalidMeeting('The date you entered is in '\
+ raise InvalidMeeting('The date you entered is in '
'the past')
if meeting_time_start > meeting_time_stop:
11 years, 2 months
[fedocal] #25: General iCal feed
by fedocal
#25: General iCal feed
-------------------------+-------------------------
Reporter: pingou | Owner:
Type: enhancement | Status: new
Priority: major | Milestone: 0.1.0
Component: fedocal | Version: development
Keywords: |
-------------------------+-------------------------
It would be nice to have one general iCal feed providing all the meetings
for all the agendas.
--
Ticket URL: <https://fedorahosted.org/fedocal/ticket/25>
fedocal <https://fedorahosted.org/fedocal>
A web-based calendar application for Fedora
11 years, 2 months
[fedocal] master: Add a global iCal feed providing meetings information for all calendars (6b3cb55)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 6b3cb5566d9a661931e22c1dbffb38610e5bcd91
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 17 00:53:29 2013 +0100
Add a global iCal feed providing meetings information for all calendars
>---------------------------------------------------------------
fedocal/__init__.py | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index ce049e8..1ba4b2f 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -226,6 +226,22 @@ def calendar_list(calendar_name, year, month, day):
admin=admin)
+(a)APP.route('/ical/')
+def ical_all():
+ """ Returns a iCal feed of all calendars from today - 1 month to
+ today + 6 month.
+ """
+ startd = datetime.date.today() - datetime.timedelta(days=30)
+ endd = datetime.date.today() + datetime.timedelta(days=180)
+ ical = vobject.iCalendar()
+ meetings = []
+ for calendar in Calendar.get_all(SESSION):
+ meetings.extend(fedocallib.get_meetings_by_date(SESSION,
+ calendar.calendar_name, startd, endd))
+ fedocallib.add_meetings_to_vcal(ical, meetings)
+ return flask.Response(ical.serialize(), mimetype='text/calendar')
+
+
@APP.route('/ical/<calendar_name>/')
def ical_out(calendar_name):
""" Returns a iCal feed of the calendar from today - 1 month to
11 years, 2 months