[fedocal] master: pep8 and pylnt run on test_fedocallib (763a8a1)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 763a8a117fc9662fe66da4323cbb5633af0a6cc2
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:58:43 2012 +0100
pep8 and pylnt run on test_fedocallib
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 539b70e..5018632 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -613,6 +613,7 @@ class Fedocallibtests(Modeltests):
output = fedocallib.get_week_day_index()
self.assertEqual(output, today.isoweekday())
+ # pylint: disable=R0915
def test_add_meeting(self):
""" Test the add_meeting function. """
self.__setup_calendar()
@@ -662,7 +663,6 @@ class Fedocallibtests(Modeltests):
None, None)
self.session.rollback()
-
self.assertRaises(InvalidMeeting, fedocallib.add_meeting,
self.session, calendarobj, fasuser,
'Name', date.today() + timedelta(days=1),
@@ -689,7 +689,6 @@ class Fedocallibtests(Modeltests):
meeting.meeting_time_stop.strftime('%H') == '09')
self.session.flush()
-
self.assertRaises(InvalidMeeting, fedocallib.add_meeting,
self.session, calendarobj, fasuser,
'Name', date.today() + timedelta(days=1),
@@ -728,7 +727,6 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meeting.meeting_manager, 'username,pingou')
self.assertEqual(meeting.meeting_information, 'Information')
-
fedocallib.add_meeting(
self.session, calendarobj, fasuser,
'Name', date.today() + timedelta(days=1),
11 years
[fedocal] master: Remove the tzone argument as this is handled earlier from dbaction (babefea)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit babefea9d9a0580b3c5857b6e44f93600ff2d6d9
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:58:29 2012 +0100
Remove the tzone argument as this is handled earlier from dbaction
And import clean up
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 3 +--
fedocal/fedocallib/dbaction.py | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index bfa90af..e8cd26b 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -598,7 +598,6 @@ def add_meeting(session, calendarobj, fas_user,
reminder_id=reminder_id,
meeting_region=meeting_region,
recursion_frequency=frequency,
- recursion_ends=end_repeats,
- tzone=tzone)
+ recursion_ends=end_repeats)
session.commit()
diff --git a/fedocal/fedocallib/dbaction.py b/fedocal/fedocallib/dbaction.py
index de7168c..543911c 100644
--- a/fedocal/fedocallib/dbaction.py
+++ b/fedocal/fedocallib/dbaction.py
@@ -16,8 +16,6 @@ license.
"""
from datetime import date
-from datetime import datetime
-import fedocallib
import model
@@ -39,8 +37,7 @@ def add_meeting(session, meeting_name, meeting_manager,
meeting_time_start, meeting_time_stop,
meeting_information, calendarobj, reminder_id=None,
meeting_region=None,
- recursion_frequency=None, recursion_ends=None,
- tzone='UTC'):
+ recursion_frequency=None, recursion_ends=None):
""" Logic to add a meeting to the database.
"""
11 years
[fedocal] master: Remove debugging print (b7ad853)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit b7ad8533412084d6bfd8751188b24e58f672d95d
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:47:16 2012 +0100
Remove debugging print
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 6f59176..bfa90af 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -253,7 +253,6 @@ def get_meetings(session, calendar, year=None, month=None, day=None,
datetime(2000, 01, 01, int(start_time), 30, 0),
'UTC',
tzone).strftime(fmt)]:
- print key
if key in meetings:
if meetings[key][day]:
meetings[key][day].append(meeting)
11 years
[fedocal] master: Apparently wsgi does not like these imports, reverting to former style (af6c345)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit af6c345958cdc67b3ca07aeb8ba2842ee7ccec14
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:41:10 2012 +0100
Apparently wsgi does not like these imports, reverting to former style
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 9e50c4f..6f59176 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -27,10 +27,10 @@ from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import sessionmaker
from sqlalchemy.orm import scoped_session
-from fedocallib.week import Week
-from fedocallib.model import Calendar, Reminder, Meeting
-import fedocallib.dbaction as dbaction
-from fedocallib.exceptions import UserNotAllowed, InvalidMeeting
+from week import Week
+from model import Calendar, Reminder, Meeting
+import dbaction as dbaction
+from exceptions import UserNotAllowed, InvalidMeeting
from fedora_calendar import FedocalCalendar
11 years
[fedocal] master: Kinda ugly fix to display properly meetings with the half-hour work started (584afc6)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 584afc673fa9000044122c4ac780363d1efff064
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:38:13 2012 +0100
Kinda ugly fix to display properly meetings with the half-hour work started
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index aa29925..9e50c4f 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -244,16 +244,21 @@ def get_meetings(session, calendar, year=None, month=None, day=None,
cnt = 0
for item in order:
start_time = start + item
- key = convert_time(
+ day = meeting.meeting_date.weekday()
+ for key in [convert_time(
datetime(2000, 01, 01, int(start_time), 0, 0),
'UTC',
- tzone).strftime(fmt)
- day = meeting.meeting_date.weekday()
- if key in meetings:
- if meetings[key][day]:
- meetings[key][day].append(meeting)
- else:
- meetings[key][day] = [meeting]
+ tzone).strftime(fmt),
+ convert_time(
+ datetime(2000, 01, 01, int(start_time), 30, 0),
+ 'UTC',
+ tzone).strftime(fmt)]:
+ print key
+ if key in meetings:
+ if meetings[key][day]:
+ meetings[key][day].append(meeting)
+ else:
+ meetings[key][day] = [meeting]
cnt = cnt + 1
return meetings
11 years
[fedocal] master: Update unit-tests for the backend library (152833a)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 152833ab82448abebb6670f926e4ebf640eb7f91
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:32:17 2012 +0100
Update unit-tests for the backend library
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 2 +-
fedocal/tests/test_fedocallib.py | 212 ++++++++++++++++++++++++++++++++++++++
2 files changed, 213 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 8fe29c6..aa29925 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -570,7 +570,7 @@ def add_meeting(session, calendarobj, fas_user,
reminder = dbaction.add_reminder(session=session,
remind_when=remind_when,
remind_who=remind_who)
- except SQLAlchemyError, err:
+ except SQLAlchemyError, err: # pragma: no cover
print 'add_reminder:', err
raise SQLAlchemyError(err)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index e9f31c7..539b70e 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -46,6 +46,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import fedocallib
from fedocallib import model
+from fedocallib.exceptions import UserNotAllowed, InvalidMeeting
from tests import Modeltests, TODAY
RESULT_CALENDAR_HTML = '<table class="month">\n'\
@@ -79,6 +80,7 @@ class FakeUser(object):
supposed to be.
"""
self.groups = groups
+ self.username = 'username'
# pylint: disable=R0904
@@ -611,6 +613,216 @@ class Fedocallibtests(Modeltests):
output = fedocallib.get_week_day_index()
self.assertEqual(output, today.isoweekday())
+ def test_add_meeting(self):
+ """ Test the add_meeting function. """
+ self.__setup_calendar()
+ calendarobj = model.Calendar.by_id(self.session, 'test_calendar')
+ self.assertNotEqual(calendarobj, None)
+
+ self.assertRaises(AttributeError, fedocallib.add_meeting,
+ self.session, calendarobj, None,
+ None, None,
+ 9, 10, None,
+ None, None, None,
+ None, None,
+ None, None)
+
+ fasuser = FakeUser(['test'])
+ self.assertRaises(UserNotAllowed, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ None, None,
+ 9, 10, None,
+ None, None, None,
+ None, None,
+ None, None)
+
+ fasuser = FakeUser(['fi-apprentice'])
+ self.assertRaises(TypeError, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ None, None,
+ 9, 10, None,
+ None, None, None,
+ None, None,
+ None, None)
+
+ self.assertRaises(InvalidMeeting, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ None, TODAY - timedelta(days=1),
+ 9, 10, None,
+ None, None, None,
+ None, None,
+ None, None)
+
+ self.assertRaises(IntegrityError, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ None, date.today() + timedelta(days=1),
+ 9, 10, None,
+ None, None, 'Europe/Paris',
+ None, None,
+ None, None)
+ self.session.rollback()
+
+
+ self.assertRaises(InvalidMeeting, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 10, 9, None,
+ None, None, 'Europe/Paris',
+ None, None,
+ None, None)
+ self.session.rollback()
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 9, 10, None,
+ None, None, 'Europe/Paris',
+ None, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 1)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,')
+ self.assertTrue(meeting.meeting_time_start.strftime('%H') == '07' or
+ meeting.meeting_time_start.strftime('%H') == '08')
+ self.assertTrue(meeting.meeting_time_stop.strftime('%H') == '08' or
+ meeting.meeting_time_stop.strftime('%H') == '09')
+ self.session.flush()
+
+
+ self.assertRaises(InvalidMeeting, fedocallib.add_meeting,
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 9, 10, None,
+ None, None, 'Europe/Paris',
+ None, None,
+ None, None)
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 10, 11, 'pingou',
+ None, None, 'Europe/Paris',
+ None, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 2)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertTrue(meeting.meeting_time_start.strftime('%H') == '08' or
+ meeting.meeting_time_start.strftime('%H') == '09')
+ self.assertTrue(meeting.meeting_time_stop.strftime('%H') == '09' or
+ meeting.meeting_time_stop.strftime('%H') == '10')
+ self.session.commit()
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 11, 12, 'pingou',
+ 'Information', None, 'Europe/Paris',
+ None, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 3)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 13, 14, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ None, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 4)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, None)
+
+ calendarobj = model.Calendar.by_id(self.session, 'test_calendar4')
+ fasuser = FakeUser(['packager'])
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 9, 10, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ None, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 5)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, 'EMEA')
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 10, 11, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ 7, None,
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 6)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, 'EMEA')
+ self.assertEqual(meeting.recursion_frequency, 7)
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 11, 12, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ 7, date.today() + timedelta(days=28),
+ None, None)
+ meeting = model.Meeting.by_id(self.session, 7)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, 'EMEA')
+ self.assertEqual(meeting.recursion_frequency, 7)
+ self.assertEqual((meeting.recursion_ends - date.today()).days,
+ 28)
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 12, 13, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ 7, date.today() + timedelta(days=28),
+ '', 'test(a)example.org')
+ meeting = model.Meeting.by_id(self.session, 8)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, 'EMEA')
+ self.assertEqual(meeting.recursion_frequency, 7)
+ self.assertEqual(meeting.reminder, None)
+
+ fedocallib.add_meeting(
+ self.session, calendarobj, fasuser,
+ 'Name', date.today() + timedelta(days=1),
+ 13, 14, 'pingou',
+ 'Information', 'EMEA', 'Europe/Paris',
+ 7, date.today() + timedelta(days=28),
+ 'H-12', 'test(a)example.org')
+ meeting = model.Meeting.by_id(self.session, 8)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Name')
+ self.assertEqual(meeting.meeting_manager, 'username,pingou')
+ self.assertEqual(meeting.meeting_information, 'Information')
+ self.assertEqual(meeting.meeting_region, 'EMEA')
+ self.assertEqual(meeting.recursion_frequency, 7)
+ self.assertEqual(meeting.reminder, None)
if __name__ == '__main__':
SUITE = unittest.TestLoader().loadTestsFromTestCase(Fedocallibtests)
11 years
[fedocal] master: Move the addition of the meeting to the DB out from the controller (7bb7f9a)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 7bb7f9a0f0d6f7a824bee7c69597b55c5c2a1482
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:29:43 2012 +0100
Move the addition of the meeting to the DB out from the controller
>---------------------------------------------------------------
fedocal/__init__.py | 111 ++++++++++++++-------------------------------------
1 files changed, 30 insertions(+), 81 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index a6b1c2d..418ad51 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -34,6 +34,7 @@ import os
import datetime
from urlparse import urljoin, urlparse
import vobject
+from sqlalchemy.exc import SQLAlchemyError
import flask
from flask_fas import FAS, cla_plus_one_required
@@ -41,6 +42,7 @@ from flask_fas import FAS, cla_plus_one_required
import forms as forms
import fedocallib as fedocallib
import fedocallib.dbaction
+from fedocallib.exceptions import FedocalException
from fedocallib.model import (Calendar, Meeting, Reminder)
CONFIG = ConfigParser.ConfigParser()
@@ -297,90 +299,37 @@ def add_meeting(calendar_name):
calendarobj = Calendar.by_id(SESSION, calendar_name)
# pylint: disable=E1101
if form.validate_on_submit():
- if not fedocallib.is_user_managing_in_calendar(SESSION,
- calendarobj.calendar_name, flask.g.fas_user):
- flask.flash('You are not allowed to add a meeting to'\
- ' this calendar')
- return flask.redirect(flask.url_for('index'))
-
- if not fedocallib.is_date_in_future(form.meeting_date.data,
- form.meeting_time_start.data):
- flask.flash('The date you entered is in the past')
- return flask.redirect(flask.url_for('add_meeting',
- calendar_name=calendarobj.calendar_name, form=form,
+ try:
+ fedocallib.add_meeting(session=SESSION,
+ calendarobj=calendarobj,
+ fas_user=flask.g.fas_user,
+ meeting_name=form.meeting_name.data,
+ meeting_date=form.meeting_date.data,
+ # meeting_date_end,
+ meeting_time_start=form.meeting_time_start.data,
+ meeting_time_stop=form.meeting_time_stop.data,
+ comanager=form.comanager.data,
+ meeting_information=form.information.data,
+ meeting_region=form.meeting_region.data,
+ tzone=get_timezone(),
+ frequency=form.frequency.data,
+ end_repeats=form.end_repeats.data,
+ remind_when=form.remind_when.data,
+ remind_who=form.remind_who.data)
+ except FedocalException:
+ flask.redirect(flask.url_for('add_meeting',
+ calendar=calendarobj, form=form,
tzone=tzone))
-
- if int(form.meeting_time_start.data) > \
- int(form.meeting_time_stop.data):
- flask.flash('The start time you have entered is later than'\
- ' the stop time.')
- flask.render_template('add_meeting.html',
- calendar=calendarobj, form=form, tzone=tzone)
-
- if bool(calendarobj.calendar_multiple_meetings) or \
- (not bool(calendarobj.calendar_multiple_meetings) and \
- fedocallib.agenda_is_free(SESSION,
- calendarobj,
- form.meeting_date.data,
- int(form.meeting_time_start.data),
- int(form.meeting_time_stop.data)
- )):
-
- reminder = None
- if form.remind_when.data and form.remind_who.data:
- try:
- reminder = dbaction.add_reminder(session=session,
- remind_when=form.remind_when.data,
- remind_who=form.remind_who.data)
- except SQLAlchemyError, err:
- print 'add_reminder:', err
- flask.flash('Could not add this reminder to this meeting')
- return flask.render_template('add_meeting.html',
- calendar=calendarobj, form=form, tzone=tzone)
-
- reminder_id = None
- if reminder:
- reminder_id = reminder.reminder_id
-
- try:
- reminder = dbaction.add_meeting(session=session,
- meeting_name=form.meeting_name.data,
- meeting_manager='%s,' % flask.g.fas_user.username,
- meeting_date=form.meeting_date.data,
- meeting_date_end=None,
- meeting_time_start=datetime.time(int(
- form.meeting_time_start.data), 0),
- meeting_time_stop=datetime.time(int(
- form.meeting_time_stop.data), 0),
- meeting_information=form.meeting_information.data,
- calendar=calendarobj,
- reminder_id=reminder_id,
- meeting_region=form.meeting_region.data,
- recursion_frequency=form.frequency.data,
- recursion_ends=form.end_repeats.data,
- tzone=get_timezone())
- except SQLAlchemyError, err:
- print 'add_meeting:', err
- flask.flash('Could not add this meeting to this calendar')
- return flask.render_template('add_meeting.html',
- calendar=calendarobj, form=form, tzone=tzone)
-
- try:
- SESSION.commit()
- except SQLAlchemyError, err:
- flask.flash(
- 'Something went wrong while commiting to the DB.')
- flask.render_template('add_meeting.html',
- calendar=calendarobj, form=form, tzone=tzone)
-
- flask.flash('Meeting added')
- return flask.redirect(flask.url_for('calendar',
- calendar_name=calendarobj.calendar_name))
- else:
- flask.flash(
- 'The start time you have entered is already occupied.')
+ except SQLAlchemyError, err:
+ print 'add_meeting:', err
+ flask.flash('Could not add this meeting to this calendar')
return flask.render_template('add_meeting.html',
calendar=calendarobj, form=form, tzone=tzone)
+
+ flask.flash('Meeting added')
+ return flask.redirect(flask.url_for('calendar',
+ calendar_name=calendarobj.calendar_name))
+
return flask.render_template('add_meeting.html',
calendar=calendarobj, form=form, tzone=tzone)
11 years
[fedocal] master: The timezone conversion should be (and is) done earlier than the last minute (22c47d3)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 22c47d360aa6c7782a74ee155aa11aa20e2dc2cc
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:29:11 2012 +0100
The timezone conversion should be (and is) done earlier than the last minute
>---------------------------------------------------------------
fedocal/fedocallib/dbaction.py | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/fedocal/fedocallib/dbaction.py b/fedocal/fedocallib/dbaction.py
index 130d753..de7168c 100644
--- a/fedocal/fedocallib/dbaction.py
+++ b/fedocal/fedocallib/dbaction.py
@@ -21,12 +21,13 @@ import fedocallib
import model
-def add_reminder(session, remind_when, remind_who):
+def add_reminder(session, remind_when, remind_who, reminder_text=None):
""" Logic to add a reminder to the database.
"""
- reminder = model.Reminder(remind_when,
- remind_who,
- None)
+ reminder = model.Reminder(
+ reminder_offset=remind_when,
+ reminder_to=remind_who,
+ reminder_text=None)
reminder.save(session)
session.flush()
return reminder
@@ -54,15 +55,6 @@ def add_meeting(session, meeting_name, meeting_manager,
if not meeting_date_end:
meeting_date_end = meeting_date
- meeting_time_start = fedocallib.convert_time(
- datetime(2000, 1, 1,
- meeting_time_start.hour, meeting_time_start.minute),
- tzone, 'UTC')
- meeting_time_stop = fedocallib.convert_time(
- datetime(2000, 1, 1,
- meeting_time_start.hour, meeting_time_start.minute),
- tzone, 'UTC')
-
meeting = model.Meeting(
meeting_name=meeting_name,
meeting_manager=meeting_manager,
11 years
[fedocal] master: Create different exception used when added a meeting to the database (59fd3b5)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 59fd3b5259726afdb71ffae3bc3659f1f2e2d365
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:28:30 2012 +0100
Create different exception used when added a meeting to the database
>---------------------------------------------------------------
fedocal/fedocallib/exceptions.py | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/fedocal/fedocallib/exceptions.py b/fedocal/fedocallib/exceptions.py
new file mode 100644
index 0000000..68587d0
--- /dev/null
+++ b/fedocal/fedocallib/exceptions.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+"""
+exceptions - Different Exceptions classes used in the project.
+
+Copyright (C) 2012 Pierre-Yves Chibon
+Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or (at
+your option) any later version.
+See http://www.gnu.org/copyleft/gpl.html for the full text of the
+license.
+"""
+
+# pylint: disable=R0903
+class FedocalException(Exception):
+ """ Exception thrown when a user is not allowed to perform a specific
+ action.
+ """
+ pass
+
+
+# pylint: disable=R0903
+class UserNotAllowed(FedocalException):
+ """ Exception thrown when a user is not allowed to perform a specific
+ action.
+ """
+ pass
+
+
+# pylint: disable=R0903
+class InvalidMeeting(FedocalException):
+ """ Exception thrown when a user is not allowed to perform a specific
+ action.
+ """
+ pass
11 years
[fedocal] master: Have at least one calendar that accepts regions (fac7f9c)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit fac7f9c015499f3b8b3d07610760b776bbd475cf
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 9 17:28:12 2012 +0100
Have at least one calendar that accepts regions
>---------------------------------------------------------------
fedocal/tests/test_calendar.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedocal/tests/test_calendar.py b/fedocal/tests/test_calendar.py
index f150dd6..18fb1d4 100644
--- a/fedocal/tests/test_calendar.py
+++ b/fedocal/tests/test_calendar.py
@@ -74,7 +74,7 @@ class Calendartests(Modeltests):
obj = model.Calendar('test_calendar4',
'This is yet another test calendar',
- 'packager', True)
+ 'packager', True, True)
obj.save(self.session)
self.session.commit()
self.assertNotEqual(obj, None)
11 years