Download as
Browse Code »

Commit 5f06820fcbffd6fda776b54dc20673b520e3a8e4

Authored by Zambom
1 parent 1313a7d8
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adjusting invisible subject home display

Showing 3 changed files with 3 additions and 12 deletions   Show diff stats
subjects/templates/subjects/initial.html
  Diff comments   View file @5f06820
... ... @@ -16,7 +16,7 @@
16 16 </div>
17 17  
18 18 <div class="col-md-12 cards-content">
19   - <h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>
  19 + <h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>
20 20 <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
21 21 {% for subject in subjects %}
22 22 {% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
... ...
subjects/templates/subjects/subject_card.html
  Diff comments   View file @5f06820
... ... @@ -57,7 +57,7 @@
57 57 {% endif %}
58 58 </div>
59 59 </div>
60   -{% elif request.user in subject.professor.all or request.user in category.coordinators.all %}
  60 +{% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all %}
61 61 <div class="panel panel-info subject-panel-invisible">
62 62 <div class="panel-heading panel-invisible">
63 63 <div class="row">
... ...
subjects/views.py
  Diff comments   View file @5f06820
... ... @@ -44,9 +44,7 @@ class HomeView(LoginRequiredMixin, ListView):
44 44 subjects = Subject.objects.all()
45 45 subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all() or self.request.user in subject.category.coordinators.all()]
46 46  
47   -
48   - paginator = Paginator(subjects, 10)
49   -
  47 + print(subjects)
50 48  
51 49 return subjects
52 50  
... ... @@ -165,11 +163,9 @@ class SubjectCreateView(CreateView):
165 163 return super(SubjectCreateView, self).form_valid(form)
166 164  
167 165 def get_success_url(self):
168   -
169 166 if not self.object.category.visible:
170 167 self.object.visible = False
171 168 self.object.save()
172   -
173 169  
174 170 messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(self.object.name, self.object.category.name ))
175 171 return reverse_lazy('subjects:index')
... ... @@ -191,17 +187,13 @@ class SubjectUpdateView(LogMixin, UpdateView):
191 187 return context
192 188  
193 189 def get_success_url(self):
194   -
195 190 if not self.object.category.visible:
196 191 self.object.visible = False
197 192 self.object.save()
198   -
199 193  
200 194 messages.success(self.request, _('Subject "%s" was updated on "%s" successfully!')%(self.object.name, self.object.category.name ))
201 195 return reverse_lazy('subjects:index')
202 196  
203   -
204   -
205 197 class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
206 198  
207 199 login_url = reverse_lazy("users:login")
... ... @@ -227,7 +219,6 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
227 219 def get_success_url(self):
228 220  
229 221 messages.success(self.request, _('Subject removed successfully!'))
230   -
231 222  
232 223 return reverse_lazy('subjects:index')
233 224  
... ...