Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
fuji246 committed Dec 1, 2012
1 parent f4a4f96 commit 104a676
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bbb_django/bbb/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
2 changes: 1 addition & 1 deletion bbb_django/bbb/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions bbb_django/initial.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Django==1.3
flup
South
pytz
calendar
icalendar

0 comments on commit 104a676

Please sign in to comment.