Merge branch 'hotfix/lil-572' into 'master'

LIL-572 Незарегистрированный пользователь не видит курсы

See merge request lilcity/backend!70
remotes/origin/feature/effective_amount
cfwme 8 years ago
commit a0a4b0b059
  1. 14
      apps/user/templates/user/profile.html
  2. 1
      apps/user/views.py

@ -62,22 +62,22 @@
</div>
</div>
{% if not guest %}
<div class="section section_pink-light section_tabs">
<div class="section__center center">
<div class="tabs js-tabs">
<div class="tabs__nav">
{% if owner %}
<button class="tabs__btn js-tabs-btn active">ЛАГЕРЬ</button>
<button class="tabs__btn js-tabs-btn">ПРИОБРЕТЕННЫЕ
<span class="mobile-hide">КУРСЫ</span>
</button>
{% if not simple_user %}
<button class="tabs__btn js-tabs-btn">ОПУБЛИКОВАННЫЕ
{% endif %}
<button class="tabs__btn js-tabs-btn {% if not owner %}active{% endif %}">ОПУБЛИКОВАННЫЕ
<span class="mobile-hide">КУРСЫ</span>
</button>
{% endif %}
</div>
<div class="tabs__container">
{% if owner %}
<div class="tabs__item js-tabs-item" style="display: block;">
{% if is_purchased_future %}
<div class="center center_xs">
@ -126,8 +126,8 @@
</div>
</div>
</div>
{% if not simple_user %}
<div class="tabs__item js-tabs-item">
{% endif %}
<div class="tabs__item js-tabs-item" {% if not owner %}style="display: block;"{% endif %}>
<div class="courses courses_scroll">
<div class="courses__list">
{% if published.exists %}
@ -145,10 +145,8 @@
</div>
</div>
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
{% endblock content %}

@ -56,6 +56,7 @@ class UserView(DetailView):
else:
context['simple_user'] = True
context['guest'] = True
context['owner'] = self.request.user.id == self.object.id
if context['guest'] and self.object.role <= User.USER_ROLE:
raise Http404()

Loading…
Cancel
Save