[fedocal] master: Add some documentation to the functions. (a5808cf)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit a5808cfcec37b2341b25d91bcf098c00e0e1dab5
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 17:04:35 2012 +0100
Add some documentation to the functions.
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index e07c64c..f55e115 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -78,18 +78,23 @@ class Fedocallibtests(Modeltests):
""" Fedocallib tests. """
def __setup_calendar(self):
+ """ Set up basic calendar information. """
from test_calendar import Calendartests
cal = Calendartests('test_init_calendar')
cal.session = self.session
cal.test_init_calendar()
def __setup_meeting(self):
+ """ Set up basic calendar information and add some meetings in
+ them. """
from test_meeting import Meetingtests
meeting = Meetingtests('test_init_meeting')
meeting.session = self.session
meeting.test_init_meeting()
def __setup_meeting_today(self):
+ """ Set up basic calendar information and add some meetings in
+ them (at the date of today). """
import test_meeting
test_meeting.TODAY = date.today()
self.__setup_meeting()
10 years, 4 months
[fedocal] master: Adjust the fedocallib tests to the last changes and add method to test the delete_recursive_meeting with past end_recursion (0c50b9e)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 0c50b9e300a538bf0cb4288df15653ca1720aee4
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 17:01:05 2012 +0100
Adjust the fedocallib tests to the last changes and add method to test the delete_recursive_meeting with past end_recursion
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 43f6fca..e07c64c 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -109,7 +109,7 @@ class Fedocallibtests(Modeltests):
self.__setup_calendar()
calendars = fedocallib.get_calendars(self.session)
self.assertNotEqual(calendars, None)
- self.assertEqual(len(calendars), 3)
+ self.assertEqual(len(calendars), 4)
self.assertEqual(calendars[0].calendar_name, 'test_calendar')
self.assertEqual(calendars[0].calendar_manager_group,
'fi-apprentice')
@@ -358,7 +358,7 @@ class Fedocallibtests(Modeltests):
def test_delete_recursive_meeting(self):
""" Test the delete_recursive_meeting function. """
self.__setup_meeting()
- meeting = model.Meeting.by_id(self.session, 6)
+ meeting = model.Meeting.by_id(self.session, 7)
self.assertNotEqual(meeting, None)
self.assertEqual(meeting.meeting_name, 'Another test meeting2')
self.assertEqual(meeting.recursion_ends,
@@ -366,11 +366,29 @@ class Fedocallibtests(Modeltests):
fedocallib.delete_recursive_meeting(self.session, meeting)
- meeting = model.Meeting.by_id(self.session, 6)
+ meeting = model.Meeting.by_id(self.session, 7)
self.assertNotEqual(meeting, None)
self.assertEqual(meeting.meeting_name, 'Another test meeting2')
self.assertEqual(meeting.recursion_ends, date.today())
+ def test_delete_recursive_meeting_past(self):
+ """ Test the delete_recursive_meeting for past end_datefunction.
+ """
+ self.__setup_meeting()
+ meeting = model.Meeting.by_id(self.session, 3)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'test-meeting3')
+ self.assertEqual(meeting.recursion_ends,
+ TODAY - timedelta(days=7))
+
+ fedocallib.delete_recursive_meeting(self.session, meeting)
+
+ meeting = model.Meeting.by_id(self.session, 3)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'test-meeting3')
+ self.assertEqual(meeting.recursion_ends,
+ TODAY - timedelta(days=7))
+
def test_agenda_is_free(self):
""" Test the agenda_is_free function. """
self.__setup_meeting()
@@ -399,17 +417,17 @@ class Fedocallibtests(Modeltests):
self.assertFalse(fedocallib.is_user_managing_in_calendar(
self.session, 'test_calendar', user))
- calendar = model.Calendar('test_calendar3',
- 'This is a test calendar2', '')
+ calendar = model.Calendar('test_calendar30',
+ 'This is a test calendar30', '')
calendar.save(self.session)
self.session.commit()
user = FakeUser(['packager', 'infrastructure'])
self.assertTrue(fedocallib.is_user_managing_in_calendar(
- self.session, 'test_calendar3', user))
+ self.session, 'test_calendar30', user))
user = FakeUser([])
self.assertTrue(fedocallib.is_user_managing_in_calendar(
- self.session, 'test_calendar3', user))
+ self.session, 'test_calendar30', user))
def test_retrieve_meeting_to_remind(self):
""" Test the retrieve_meeting_to_remind function. """
10 years, 4 months
[fedocal] master: Add another test meeting with a recursion_ends past (39cb62b)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 39cb62b9e385c78c7a23f38e586557392b1f767b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 17:00:13 2012 +0100
Add another test meeting with a recursion_ends past
>---------------------------------------------------------------
fedocal/tests/test_meeting.py | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/fedocal/tests/test_meeting.py b/fedocal/tests/test_meeting.py
index 6319d4a..b598392 100644
--- a/fedocal/tests/test_meeting.py
+++ b/fedocal/tests/test_meeting.py
@@ -59,12 +59,13 @@ class Meetingtests(Modeltests):
caltest.session = self.session
caltest.test_init_calendar()
obj = model.Meeting(
- 'Fedora-fr-test-meeting', 'pingou, shaiton',
- TODAY, time(19, 00), time(20, 00),
- 'This is a test meeting',
- 'test_calendar',
- None,
- None)
+ meeting_name='Fedora-fr-test-meeting',
+ meeting_manager='pingou, shaiton',
+ meeting_date=TODAY,
+ meeting_time_start=time(19, 00),
+ meeting_time_stop=time(20, 00),
+ meeting_information='This is a test meeting',
+ calendar_name='test_calendar')
obj.save(self.session)
self.session.commit()
self.assertNotEqual(obj, None)
@@ -81,6 +82,21 @@ class Meetingtests(Modeltests):
self.session.commit()
self.assertNotEqual(obj, None)
+ # Meeting with end_recursion in the past
+ obj = model.Meeting(
+ meeting_name='test-meeting3',
+ meeting_manager='test2',
+ meeting_date=TODAY - timedelta(days=16),
+ meeting_time_start=time(14, 00),
+ meeting_time_stop=time(16, 00),
+ meeting_information='Test meeting with past end_recursion.',
+ calendar_name='test_calendar3',
+ recursion_frequency=7,
+ recursion_ends=TODAY - timedelta(days=7))
+ obj.save(self.session)
+ self.session.commit()
+ self.assertNotEqual(obj, None)
+
# Two meetings at the same time
obj = model.Meeting(
meeting_name='test-meeting-st-1',
10 years, 4 months
[fedocal] master: Add another calendar to the test database (0f7b060)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 0f7b060f595ed95acdc49b7842750fe9e0eed040
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 16:59:44 2012 +0100
Add another calendar to the test database
>---------------------------------------------------------------
fedocal/tests/test_calendar.py | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fedocal/tests/test_calendar.py b/fedocal/tests/test_calendar.py
index c193490..f150dd6 100644
--- a/fedocal/tests/test_calendar.py
+++ b/fedocal/tests/test_calendar.py
@@ -65,6 +65,13 @@ class Calendartests(Modeltests):
self.session.commit()
self.assertNotEqual(obj, None)
+ obj = model.Calendar('test_calendar3',
+ 'This is the third test calendar',
+ 'packager', True)
+ obj.save(self.session)
+ self.session.commit()
+ self.assertNotEqual(obj, None)
+
obj = model.Calendar('test_calendar4',
'This is yet another test calendar',
'packager', True)
@@ -115,9 +122,11 @@ class Calendartests(Modeltests):
self.test_init_calendar()
obj = model.Calendar.get_all(self.session)
self.assertNotEqual(obj, None)
- self.assertEqual(len(obj), 3)
+ self.assertEqual(len(obj), 4)
self.assertEqual(obj[0].calendar_name, 'test_calendar')
self.assertEqual(obj[1].calendar_name, 'test_calendar2')
+ self.assertEqual(obj[2].calendar_name, 'test_calendar3')
+ self.assertEqual(obj[3].calendar_name, 'test_calendar4')
def test_get_all_calendar_empty_db(self):
""" Test the Calendar get_all function when the DB is empty. """
10 years, 4 months
[fedocal] master: Rename and put a full path for the default DB in the sample config file (ac9a8df)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit ac9a8df366f31fc8a8fef40711d1f54aa93b73a6
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 16:42:07 2012 +0100
Rename and put a full path for the default DB in the sample config file
>---------------------------------------------------------------
fedocal/fedocal.cfg.sample | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocal.cfg.sample b/fedocal/fedocal.cfg.sample
index 4bd9672..8893e9e 100644
--- a/fedocal/fedocal.cfg.sample
+++ b/fedocal/fedocal.cfg.sample
@@ -4,6 +4,6 @@ secret_key=<The web application secret key>
# url to the database server:
;db_url=mysql://user:pass@host/db_name
;db_url=postgres://user:pass@host/db_name
-db_url=sqlite:///db_dev
+db_url=sqlite:////tmp/fedocal_dev.sqlite
# The FAS group in which the admin of fedocal are
admin_group=fedocal_admin
10 years, 4 months
[fedocal] master: Add unit-test for the delete_recursive_meeting function (8b96d41)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 8b96d41f192548128692f4fb07acdf85ca0b59fb
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 16:38:15 2012 +0100
Add unit-test for the delete_recursive_meeting function
And guess what?? Writing this test showed up a bug which this
commit fixes as well! \ó/
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 8 ++++----
fedocal/tests/test_fedocallib.py | 16 ++++++++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 7292165..351edf0 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -353,14 +353,14 @@ def delete_recursive_meeting(session, meeting):
:arg meeting: the Meeting object from which are removed all further
meetings.
"""
- today = datetime.utcnow()
+ today = date.today()
if not meeting.recursion_frequency \
- or meeting.recursion_ends < today.date():
+ or meeting.recursion_ends < today:
return
else:
- meeting.recursion_ends = today.date()
+ meeting.recursion_ends = today
meeting.save(session)
- session.commit(meeting)
+ session.commit()
def _generate_date_rounded_to_the_hour(meetingdate, offset):
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 5e29168..43f6fca 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -355,6 +355,22 @@ class Fedocallibtests(Modeltests):
self.assertEqual(len(meetings), 0)
self.assertEqual(meetings, [])
+ def test_delete_recursive_meeting(self):
+ """ Test the delete_recursive_meeting function. """
+ self.__setup_meeting()
+ meeting = model.Meeting.by_id(self.session, 6)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Another test meeting2')
+ self.assertEqual(meeting.recursion_ends,
+ TODAY + timedelta(days=90))
+
+ fedocallib.delete_recursive_meeting(self.session, meeting)
+
+ meeting = model.Meeting.by_id(self.session, 6)
+ self.assertNotEqual(meeting, None)
+ self.assertEqual(meeting.meeting_name, 'Another test meeting2')
+ self.assertEqual(meeting.recursion_ends, date.today())
+
def test_agenda_is_free(self):
""" Test the agenda_is_free function. """
self.__setup_meeting()
10 years, 4 months
[fedocal] master: Fix unit-tests (f6f0c2b)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit f6f0c2b464fbdb44dbd5fb566ae45ff8312c0d21
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 16:27:26 2012 +0100
Fix unit-tests
From now on, the get_active_regular_meeting requires a complete
time frame (defaults to 7 days).
This change impacts the Week object which has been adjusted for it.
The other unit-tests have been fixed as well
>---------------------------------------------------------------
fedocal/fedocallib/model.py | 11 +++++++----
fedocal/fedocallib/week.py | 2 +-
fedocal/tests/test_fedocallib.py | 28 ++++++++++++++++------------
fedocal/tests/test_week.py | 2 +-
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/fedocal/fedocallib/model.py b/fedocal/fedocallib/model.py
index 60038c4..66ae53a 100644
--- a/fedocal/fedocallib/model.py
+++ b/fedocal/fedocallib/model.py
@@ -19,6 +19,7 @@ import pkg_resources
from datetime import datetime
from datetime import date
+from datetime import timedelta
from sqlalchemy import (
Boolean,
@@ -265,11 +266,13 @@ class Meeting(BASE):
(Meeting.meeting_date < stop_date)).all()
@classmethod
- def get_active_regular_meeting(cls, session, end_date):
+ def get_active_regular_meeting(cls, session, start_date, end_date):
""" Retrieve the list of meetings with a recursion which
- end_date is not past the provided end_date.
+ end_date is not past the provided end_date and starting before
+ the end of the time considered.
"""
meetings = session.query(cls).filter(and_
+ (Meeting.meeting_date <= end_date),
(Meeting.recursion_ends >= end_date),
(Meeting.recursion_frequency != None)
).order_by(Meeting.meeting_date).all()
@@ -323,13 +326,13 @@ class Meeting(BASE):
@classmethod
def get_future_regular_meeting_of_user(cls, session, username,
- end_date=date.today()):
+ start_date=date.today()):
""" Retrieve the list of meetings which specified username
is among the managers and which end date is older or egual to
specified one (which by default is today).
"""
meetings = session.query(cls).filter(and_
- (Meeting.recursion_ends >= end_date),
+ (Meeting.recursion_ends >= start_date),
(Meeting.recursion_frequency != None),
(Meeting.meeting_manager.like('%%%s%%' % username))
).order_by(Meeting.meeting_date).all()
diff --git a/fedocal/fedocallib/week.py b/fedocal/fedocallib/week.py
index 6e8fa21..399e6d1 100644
--- a/fedocal/fedocallib/week.py
+++ b/fedocal/fedocallib/week.py
@@ -43,7 +43,7 @@ class Week(object):
self.start_date, self.stop_date)
for meeting in Meeting.get_active_regular_meeting(self.session,
- self.start_date):
+ self.start_date, self.stop_date):
for delta in range(0, 7):
day = self.start_date + timedelta(days=delta)
if ((meeting.meeting_date - day).days %
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 91f0079..5e29168 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -154,14 +154,14 @@ class Fedocallibtests(Modeltests):
self.assertEqual(week.calendar.calendar_name, 'test_calendar')
self.assertNotEqual(week.meetings, None)
self.assertEqual(len(week.meetings), 2)
- self.assertEqual(week.meetings[1].meeting_name,
- 'Another test meeting2')
- self.assertEqual(week.meetings[1].meeting_information,
- 'This is a test meeting with recursion2')
self.assertEqual(week.meetings[0].meeting_name,
'Fedora-fr-test-meeting')
self.assertEqual(week.meetings[0].meeting_information,
'This is a test meeting')
+ self.assertEqual(week.meetings[1].meeting_name,
+ 'Another test meeting2')
+ self.assertEqual(week.meetings[1].meeting_information,
+ 'This is a test meeting with recursion2')
def test_get_week_empty(self):
""" Test the get_week function with no meetings. """
@@ -319,8 +319,8 @@ class Fedocallibtests(Modeltests):
""" Test the get_future_single_meeting_of_user function on a
empty meeting table. """
self.__setup_calendar()
- meetings = fedocallib.get_future_single_meeting_of_user(self.session,
- 'pingou')
+ meetings = fedocallib.get_future_single_meeting_of_user(
+ self.session, 'pingou')
self.assertNotEqual(meetings, None)
self.assertEqual(len(meetings), 0)
self.assertEqual(meetings, [])
@@ -328,17 +328,21 @@ class Fedocallibtests(Modeltests):
def test_get_future_regular_meeting_of_user(self):
""" Test the get_future_regular_meeting_of_user function. """
self.__setup_meeting()
- meetings = fedocallib.get_future_regular_meeting_of_user(self.session,
- 'pingou')
+ meetings = fedocallib.get_future_regular_meeting_of_user(
+ self.session, 'pingou')
self.assertNotEqual(meetings, None)
- self.assertEqual(len(meetings), 2)
+ self.assertEqual(len(meetings), 3)
self.assertEqual(meetings[0].meeting_name,
- 'Another test meeting')
+ 'Another test meeting2')
self.assertEqual(meetings[0].meeting_information,
- 'This is a test meeting with recursion')
+ 'This is a test meeting with recursion2')
self.assertEqual(meetings[1].meeting_name,
- 'Test meeting with reminder and recursion')
+ 'Another test meeting')
self.assertEqual(meetings[1].meeting_information,
+ 'This is a test meeting with recursion')
+ self.assertEqual(meetings[2].meeting_name,
+ 'Test meeting with reminder and recursion')
+ self.assertEqual(meetings[2].meeting_information,
'This is a test meeting with recursion and reminder')
def test_get_future_regular_meeting_of_user_empty(self):
diff --git a/fedocal/tests/test_week.py b/fedocal/tests/test_week.py
index f3ce9f2..ab5f81e 100644
--- a/fedocal/tests/test_week.py
+++ b/fedocal/tests/test_week.py
@@ -75,7 +75,7 @@ class Weektests(Modeltests):
self.assertNotEqual(weekobj, None)
self.assertEqual(weekobj.start_date, TODAY)
self.assertEqual(weekobj.stop_date, end_date)
- self.assertEqual(len(weekobj.meetings), 4)
+ self.assertEqual(len(weekobj.meetings), 2)
def test_repr_week(self):
""" Test if the week string representation is correct. """
10 years, 4 months
[fedocal] master: lint: remove unsed import, add documentation (5225f92)
by trasher@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 5225f92bb3726c551dd0706edf84b67f4666bbb1
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 15:52:58 2012 +0100
lint: remove unsed import, add documentation
>---------------------------------------------------------------
fedocal/fedocallib/fedora_calendar.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocallib/fedora_calendar.py b/fedocal/fedocallib/fedora_calendar.py
index ece9865..7d0ad83 100644
--- a/fedocal/fedocallib/fedora_calendar.py
+++ b/fedocal/fedocallib/fedora_calendar.py
@@ -15,9 +15,11 @@ license.
"""
from calendar import HTMLCalendar
-from datetime import date
class FedocalCalendar(HTMLCalendar):
+ """ Improve Python's HTMLCalendar object adding
+ html validation and some features 'locally required'
+ """
def formatmonth(self, theyear, themonth, withyear=True):
"""
10 years, 4 months
[fedocal] master: Make use of the global TODAY for the tests (0fab36c)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 0fab36cd7e7d2e0543672100bc44dec98e3992d1
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 15:37:54 2012 +0100
Make use of the global TODAY for the tests
>---------------------------------------------------------------
fedocal/tests/test_week.py | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/fedocal/tests/test_week.py b/fedocal/tests/test_week.py
index d32dc43..f3ce9f2 100644
--- a/fedocal/tests/test_week.py
+++ b/fedocal/tests/test_week.py
@@ -47,7 +47,7 @@ from fedocallib import model
from fedocallib import week
from tests import Modeltests
-from test_meeting import Meetingtests
+from test_meeting import Meetingtests, TODAY
class Weektests(Modeltests):
@@ -69,32 +69,29 @@ class Weektests(Modeltests):
def test_init_week(self):
""" Test the Week init function. """
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
self.assertNotEqual(weekobj, None)
- self.assertEqual(weekobj.start_date, today)
+ self.assertEqual(weekobj.start_date, TODAY)
self.assertEqual(weekobj.stop_date, end_date)
- self.assertEqual(len(weekobj.meetings), 2)
+ self.assertEqual(len(weekobj.meetings), 4)
def test_repr_week(self):
""" Test if the week string representation is correct. """
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
self.assertNotEqual(weekobj, None)
self.assertEqual(str(weekobj), "<Week('%s' from '%s' to '%s')>" % (
- calendar.calendar_name, today, end_date))
+ calendar.calendar_name, TODAY, end_date))
def test_meeting_in_week(self):
""" Test that the meetings in the week are correct function. """
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
# Test the meeting in the week
self.assertNotEqual(weekobj, None)
10 years, 4 months
[fedocal] master: Only show the recursive text if the meeting is recursive and remove debug prints (80c125d)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 80c125d39edc9df8134b63732fa061753e1621b9
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 15:36:28 2012 +0100
Only show the recursive text if the meeting is recursive and remove debug prints
>---------------------------------------------------------------
fedocal/templates/edit_meeting.html | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fedocal/templates/edit_meeting.html b/fedocal/templates/edit_meeting.html
index 0fc37e7..0089c22 100644
--- a/fedocal/templates/edit_meeting.html
+++ b/fedocal/templates/edit_meeting.html
@@ -23,10 +23,8 @@
<p>If this is a regular meeting this is where you want to set it as so.</p>
<table>
{{ render_field_in_row(form.frequency) }}
-{{meeting.recursion.recursion_frequency}}
{{ render_field_in_row(form.end_repeats,
after='Leave empty if there is no end date for the repeat.') }}
-{{meeting.recursion.recursion_ends}}
</table>
<h4>Reminder</h4>
@@ -38,11 +36,12 @@
{{ render_field_in_row(form.remind_who) }}
</table>
+{% if meeting.recursion_frequency %}
<h4>Edit all?</h4>
-<p>This meeting is a recursive meeting, by default your changes will only
-affect this meeting unless you explecitely say otherwise:
+<p>This meeting is a recursive meeting, your changes will
+affect all the meetings related.
</p>
-{{ render_field(form.recursive_edit) }}
+{% endif %}
<p class="buttons indent">
<input type="submit" class="submit positive" value="Edit">
10 years, 4 months