Merge branch 'dev' into 'master'

fix user profile 500

See merge request lilcity/backend!51
remotes/origin/feature/effective_amount
cfwme 8 years ago
commit f7ccec6780
  1. 2
      apps/user/views.py

@ -97,7 +97,7 @@ class UserView(DetailView):
context['all_school_schedules'] = SchoolSchedule.objects.all()
school_payment_future = SchoolPayment.objects.filter(
user=self.request.user,
user=self.object,
date_start__gte=now(),
date_end__gte=now()
)

Loading…
Cancel
Save