Clear not needed tabs & UserView

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 5e4a624999
commit 3f750805dd
  1. 29
      apps/user/templates/user/profile.html
  2. 22
      apps/user/views.py

@ -71,14 +71,6 @@
<span class="mobile-hide">КУРСЫ</span>
</button>
{% endif %}
<button class="tabs__btn js-tabs-btn">ШКОЛА</button>
{% comment %} <button class="tabs__btn js-tabs-btn">
<span class="mobile-hide">КУРСЫ</span>
НА МОДЕРАЦИИ
</button>
<button class="tabs__btn js-tabs-btn">ЧЕРНОВИК
<span class="mobile-hide">КУРСА</span>
</button> {% endcomment %}
</div>
<div class="tabs__container">
<div class="tabs__item js-tabs-item">
@ -97,27 +89,6 @@
</div>
</div>
{% endif %}
<div class="tabs__item js-tabs-item">
<div class="courses courses_scroll">
<div class="courses__list">
{% include "course/school.html" %}
</div>
</div>
</div>
{% comment %} <div class="tabs__item js-tabs-item">
<div class="courses courses_scroll">
<div class="courses__list">
{% include "course/course_items.html" with course_items=pending %}
</div>
</div>
</div>
<div class="tabs__item js-tabs-item">
<div class="courses courses_scroll">
<div class="courses__list">
{% include "course/course_items.html" with course_items=drafts %}
</div>
</div>
</div> {% endcomment %}
</div>
</div>
</div>

@ -53,12 +53,6 @@ class UserView(DetailView):
context['published'] = Course.objects.filter(
author=self.object,
)
context['pending'] = Course.objects.filter(
author=self.object, status=Course.PENDING
)
context['drafts'] = Course.objects.filter(
author=self.object, status=Course.DRAFT
)
context['paid'] = Course.objects.filter(
payments__in=CoursePayment.objects.filter(
user=self.object,
@ -69,22 +63,6 @@ class UserView(DetailView):
],
),
).distinct()
school_payment = SchoolPayment.objects.filter(
user=self.object,
date_start__lte=now(),
date_end__gt=now(),
status__in=[
Pingback.PINGBACK_TYPE_REGULAR,
Pingback.PINGBACK_TYPE_GOODWILL,
Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
],
).last()
context['school_payment'] = school_payment
if school_payment and school_payment.date_end:
context['school_days_left'] = (school_payment.date_end - now().date()).days
context['school_schedules'] = SchoolSchedule.objects.filter(
weekday__in=school_payment.weekdays if school_payment else [],
)
return context

Loading…
Cancel
Save