Reviewers: ,
Please review this at http://codereview.tryton.org/721004/
Affected files:
M calendar_.py
Index: calendar_.py
===================================================================
--- a/calendar_.py
+++ b/calendar_.py
@@ -555,17 +555,17 @@ class Event(ModelSQL, ModelView):
Check the recurrence is not recurrent.
'''
if self.parent:
if self.rdates \
or self.rrules \
or self.exdates \
or self.exrules \
or self.occurences:
- self.raise_user_error('invalid_recurrence',
(event.rec_name,))
+ self.raise_user_error('invalid_recurrence',
(self.rec_name,))
@classmethod
def create(cls, vlist):
pool = Pool()
Calendar = pool.get('calendar.calendar')
Collection = pool.get('webdav.collection')
events = super(Event, cls).create(vlist)
@@ -791,16 +791,17 @@ class Event(ModelSQL, ModelView):
@classmethod
def ical2values(cls, event_id, ical, calendar_id, vevent=None):
'''
Convert iCalendar to values for create or write with
the event id for write or None for create
'''
pool = Pool()
+ Attendee = pool.get('calendar.event.attendee')
Category = pool.get('calendar.category')
Location = pool.get('calendar.location')
Alarm = pool.get('calendar.event.alarm')
Rdate = pool.get('calendar.event.rdate')
Exdate = pool.get('calendar.event.exdate')
Rrule = pool.get('calendar.rrule')
Exrule = pool.get('calendar.event.exrule')
@@ -1700,104 +1701,104 @@ class RRuleMixin(Model):
def check_bysecond(self):
if self.bysecond:
for second in self.bysecond.split(','):
try:
second = int(second)
except Exception:
second = -1
if not (second >= 0 and second <= 59):
- self.raise_user_error('invalid_bysecond',
(rule.rec_name,))
+ self.raise_user_error('invalid_bysecond',
(self.rec_name,))
def check_byminute(self):
if self.byminute:
for minute in self.byminute.split(','):
try:
minute = int(minute)
except Exception:
minute = -1
if not (minute >= 0 and minute <= 59):
- self.raise_user_error('invalid_byminute',
(rule.rec_name,))
+ self.raise_user_error('invalid_byminute',
(self.rec_name,))
def check_byhour(self):
if self.byhour:
for hour in self.byhour.split(','):
try:
hour = int(hour)
except Exception:
hour = -1
if not (hour >= 0 and hour <= 23):
- self.raise_user_error('invalid_byhour',
(rule.rec_name,))
+ self.raise_user_error('invalid_byhour',
(self.rec_name,))
def check_byday(self):
if self.byday:
for weekdaynum in self.byday.split(','):
weekday = weekdaynum[-2:]
if weekday not in
('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'):
- self.raise_user_error('invalid_byday',
(rule.rec_name,))
+ self.raise_user_error('invalid_byday',
(self.rec_name,))
ordwk = weekday[:-2]
if not ordwk:
continue
try:
ordwk = int(ordwk)
except Exception:
ordwk = -1
if not (abs(ordwk) >= 1 and abs(ordwk) <= 53):
- self.raise_user_error('invalid_byday',
(rule.rec_name,))
+ self.raise_user_error('invalid_byday',
(self.rec_name,))
def check_bymonthday(self):
if self.bymonthday:
for monthdaynum in self.bymonthday.split(','):
try:
monthdaynum = int(monthdaynum)
except Exception:
monthdaynum = -100
if not (abs(monthdaynum) >= 1 and abs(monthdaynum) <= 31):
self.raise_user_error('invalid_bymonthday', (
- rule.rec_name,))
+ self.rec_name,))
def check_byyearday(self):
if self.byyearday:
for yeardaynum in self.byyearday.split(','):
try:
yeardaynum = int(yeardaynum)
except Exception:
yeardaynum = -1000
if not (abs(yeardaynum) >= 1 and abs(yeardaynum) <= 366):
- self.raise_user_error('invalid_byyearday',
(rule.rec_name,))
+ self.raise_user_error('invalid_byyearday',
(self.rec_name,))
def check_byweekno(self):
if self.byweekno:
for weeknum in self.byweekno.split(','):
try:
weeknum = int(weeknum)
except Exception:
weeknum = -100
if not (abs(weeknum) >= 1 and abs(weeknum) <= 53):
- self.raise_user_error('invalid_byweekno',
(rule.rec_name,))
+ self.raise_user_error('invalid_byweekno',
(self.rec_name,))
def check_bymonth(self):
if self.bymonth:
for monthnum in self.bymonth.split(','):
try:
monthnum = int(monthnum)
except Exception:
monthnum = -1
if not (monthnum >= 1 and monthnum <= 12):
- self.raise_user_error('invalid_bymonth',
(rule.rec_name,))
+ self.raise_user_error('invalid_bymonth',
(self.rec_name,))
def check_bysetpos(self):
if self.bysetpos:
for setposday in self.bysetpos.split(','):
try:
setposday = int(setposday)
except Exception:
setposday = -1000
if not (abs(setposday) >= 1 and abs(setposday) <= 366):
- self.raise_user_error('invalid_bysetpos',
(rule.rec_name,))
+ self.raise_user_error('invalid_bysetpos',
(self.rec_name,))
def _rule2update(self):
res = {}
for field in ('freq', 'until_date', 'until', 'count', 'interval',
'bysecond', 'byminute', 'byhour', 'byday', 'bymonthday',
'byyearday', 'byweekno', 'bymonth', 'bysetpos', 'wkst'):
res[field] = getattr(self, field)
return res
