Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[TMP] Golem_activity #4

Merged
fabien merged 15 commits from michel/GOLEM:michel_activites into master 2018-02-01 19:29:09 +01:00
Conversation 0 Commits 15 Files Changed 5 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7727e9d51d - Show all commits

8
golem_activity/models/golem_activity.py
View File

@ -102,12 +102,12 @@ class GolemActivity(models.Model):
activity.date_start > activity.date_stop:
raise models.ValidationError(_('Start of the period cannot be '
'after end of the period.'))
if activity.season_id.date_start > activity.date_start < activity.season_id.date_end:
msg = _(u'Start of the activity is not in range of an '
if activity.season_id.date_start > activity.date_start:
msg = _(u'The start date of the activity is not in range of an '
'existing period.')
raise models.ValidationError(msg)
if activity.season_id.date_end < activity.date_stop > activity.season_id.date_start:
msg = _(u'End of the activity is not in range of an '
if activity.season_id.date_end < activity.date_stop:
msg = _(u'The end date of the activity is not in range of an '
'existing period.')
raise models.ValidationError(msg)