Commit 3d3bb33cc79082801ba57630ca33675e7aa74aff
1 parent
03fc8cb4
Exists in
master
and in
3 other branches
fixed description in manage categories
Showing
3 changed files
with
5 additions
and
8 deletions
Show diff stats
categories/templates/categories/list.html
... | ... | @@ -83,11 +83,11 @@ |
83 | 83 | |
84 | 84 | <h4> {% trans "Coordinator(s): " %} |
85 | 85 | {% for coordinator in category.coordinators.all %} |
86 | - {{coordinator.username}} | |
86 | + {{coordinator.social_name}} | |
87 | 87 | {% endfor %} |
88 | 88 | </h4> |
89 | 89 | |
90 | - | |
90 | + {{category.description|safe}} | |
91 | 91 | </div> |
92 | 92 | |
93 | 93 | ... | ... |
subjects/templates/subjects/list.html
... | ... | @@ -76,13 +76,13 @@ |
76 | 76 | |
77 | 77 | <h4> {% trans "Coordinator(s): " %} |
78 | 78 | {% for coordinator in category.coordinators.all %} |
79 | - {{coordinator.username}} | |
79 | + {{coordinator.social_name}} | |
80 | 80 | {% endfor %} |
81 | 81 | </h4> |
82 | 82 | {{category.description|safe}} |
83 | - {% if user in category.coordinators.all %} | |
83 | + {% if user in category.coordinators.all %} | |
84 | 84 | <button class="create-subject-btn"> {% trans "create new subject" %} </button> |
85 | - {% endif %} | |
85 | + {% endif %} | |
86 | 86 | |
87 | 87 | </div> |
88 | 88 | ... | ... |
subjects/views.py
... | ... | @@ -37,8 +37,6 @@ class IndexView(LoginRequiredMixin, ListView): |
37 | 37 | |
38 | 38 | def get_queryset(self): |
39 | 39 | result = super(IndexView, self).get_queryset() |
40 | - | |
41 | - | |
42 | 40 | return result |
43 | 41 | |
44 | 42 | def render_to_response(self, context, **response_kwargs): |
... | ... | @@ -59,7 +57,6 @@ class IndexView(LoginRequiredMixin, ListView): |
59 | 57 | |
60 | 58 | def get_context_data(self, **kwargs): |
61 | 59 | context = super(IndexView, self).get_context_data(**kwargs) |
62 | - list_categories = None | |
63 | 60 | categories = self.get_queryset().order_by('name') |
64 | 61 | |
65 | 62 | ... | ... |