diff --git a/bbb_django/bbb/models.py b/bbb_django/bbb/models.py index d70f61e..6ede6dd 100755 --- a/bbb_django/bbb/models.py +++ b/bbb_django/bbb/models.py @@ -40,7 +40,7 @@ class Meeting(models.Model): name = models.CharField(max_length=100, verbose_name=_('meeting name')) attendee_password = models.CharField(max_length=50, verbose_name=_('attendee password')) moderator_password = models.CharField(max_length=50, verbose_name=_('moderator password')) - welcome = models.CharField(max_length=100, verbose_name=_('welcome message')) + welcome = models.CharField(max_length=100, blank=True, verbose_name=_('welcome message')) record = models.BooleanField(default=False, verbose_name=_('record')) duration = models.IntegerField(default=0, choices=MEETING_DURATION, verbose_name=_('duration')) start_time = models.DateTimeField(verbose_name=_('start time')) diff --git a/bbb_django/bbb/views/core.py b/bbb_django/bbb/views/core.py index a018b2b..230b4d0 100644 --- a/bbb_django/bbb/views/core.py +++ b/bbb_django/bbb/views/core.py @@ -44,7 +44,7 @@ def export_meeting(request, meeting_id): cal.add_component(event) #print cal.to_ical() response = HttpResponse(cal.to_ical(), mimetype='text/calendar') - response['Content-Disposition'] = 'attachment; filename=%s.ics'%meeting.name + response['Content-Disposition'] = 'attachment; filename=%s.ics'%meeting.name.encode('utf8') return response @login_required diff --git a/bbb_django/initial.sh b/bbb_django/initial.sh index 3cab4db..4b9e79d 100755 --- a/bbb_django/initial.sh +++ b/bbb_django/initial.sh @@ -3,3 +3,5 @@ `which python` manage.py schemamigration bbb --initial sudo apt-get install language-pack-zh-base echo 'Please update the "SALT" and "BBB_API_URL" in "bbb/local_settings.py"' + +#use manage.py convert_to_south myapp to convert the old app diff --git a/requirements.txt b/requirements.txt index 97d19e4..562dd4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ Django==1.3 flup South pytz -calendar +icalendar