Skip to content

Commit 02f29a2

Browse files
committed
Remove trailing whitespace.
1 parent 1d8a06f commit 02f29a2

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

web/attempts/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Attempt(models.Model):
1313
feedback = models.TextField(default='[]', validators=[is_json_string_list])
1414
history = HistoricalRecords()
1515
submission_date = models.DateTimeField(auto_now=True)
16-
16+
1717
class Meta:
1818
unique_together = ('user', 'part')
1919

web/courses/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def course_groups(request, course_pk):
276276
verify(request.user.can_view_course_groups(course))
277277

278278
return render(
279-
request,
279+
request,
280280
"courses/course_groups.html",
281281
{
282282
"course" : course,
@@ -296,7 +296,7 @@ class Meta:
296296
widgets = {
297297
'students' : forms.CheckboxSelectMultiple()
298298
}
299-
299+
300300
def __init__(self, course_pk=None, *args, **kwargs):
301301
super(CourseGroupForm, self).__init__(*args, **kwargs)
302302
# If the course is given, we can filter the students queryset and only show those enrolled in the course
@@ -346,7 +346,7 @@ def course_groups_update(request, group_pk):
346346
@login_required
347347
def course_groups_confirm_delete(request, group_pk):
348348
"""
349-
This view will serve a modal window to tell the user if he is sure he wants to
349+
This view will serve a modal window to tell the user if he is sure he wants to
350350
delete this group.
351351
"""
352352

@@ -362,7 +362,7 @@ def course_groups_delete(request, group_pk):
362362
course_pk = group.course.pk
363363
course = get_object_or_404(Course, id=course_pk)
364364
verify(request.user.can_delete_course_groups(course))
365-
365+
366366
group.delete()
367367

368368
return redirect('course_groups', course_pk=course_pk)

web/problems/templates/python/check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def generator(expression, expected_values, should_stop=None, further_iter=None,
245245
except StopIteration:
246246
Check.error("Generator {0} se prehitro izteče.", expression)
247247
return False
248-
248+
249249
if Check.get('should_stop', should_stop):
250250
try:
251251
next(gen)

web/templates/courses/problem_set_detail.html

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% extends 'base.html' %}
2-
{% load i18n %}
2+
{% load i18n %}
33
{% load staticfiles %}
44

55
{% block title %}Tomo – {{ problem_set.title }}{% endblock %}
66

7-
8-
{% block navigation-left %}
7+
8+
{% block navigation-left %}
99
<a class="navbar-brand topnav" href="{% url 'course_detail' problem_set.course.pk %}">{{ problem_set.course.title }}</a>
1010
<a class="navbar-brand topnav" href="{% url 'problem_set_detail' problem_set.pk %}">{{ problem_set.title }} <span class="sr-only">(current)</span></a>
1111
{% endblock %}
@@ -102,7 +102,11 @@ <h5>{{ problem.title }}</h5>
102102
</a>
103103
<a class="btn btn-default btn-for-modal edit-btn" aria-label="Copy" data-url="{% url 'problem_copy' problem.id %}"
104104
data-toggle="tooltip" title="{% trans 'Copy' %}" data-container:'body'>
105-
<i class="fa fa-copy" aria-hidden="true"></i>
105+
<i class="fa fa-copy" aria-hidden="true"></i>
106+
</a>
107+
<a class="btn btn-default btn-for-modal edit-btn" aria-label="Move" data-url="{% url 'problem_move_to' problem.id %}"
108+
data-toggle="tooltip" title="{% trans 'Move to' %}" data-container:'body'>
109+
<i class="fa fa-arrows-alt" aria-hidden="true"></i>
106110
</a>
107111
<a class="btn btn-default btn-for-modal edit-btn trash-btn" aria-label="Delete" data-url="{% url 'problem_delete' problem.id %}">
108112
<i class="fa fa-trash" aria-hidden="true"></i>
@@ -124,7 +128,7 @@ <h5>{{ problem.title }}</h5>
124128
<div class="btn-group btn-group-sm" role="group" aria-label="Edit">
125129
<a class="btn btn-default btn-for-modal edit-btn" aria-label="Copy" data-url="{% url 'problem_copy' problem.id %}"
126130
data-toggle="tooltip" title="{% trans 'Copy' %}" data-container:'body'>
127-
<i class="fa fa-copy" aria-hidden="true"></i>
131+
<i class="fa fa-copy" aria-hidden="true"></i>
128132
</a>
129133
</div>
130134
{% endif %}
@@ -138,7 +142,7 @@ <h5>{{ problem.title }}</h5>
138142

139143
{% if problem.description and problem.description.strip %}
140144
<div class="panel-body">
141-
<p>
145+
<p>
142146
{{ problem.guarded_description|latex_markdown }}
143147
</p>
144148
</div>
@@ -228,4 +232,4 @@ <h5>{{ forloop.counter }}. {% trans "part" %}</h5>
228232
{% endfor %}
229233
});
230234
</script>
231-
{% endblock %}
235+
{% endblock %}

web/users/models.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class User(AbstractUser):
99
class Meta:
1010
ordering = ['last_name', 'first_name']
11-
11+
1212
def __str__(self):
1313
# In the forms, the __str__ method is used when showing model instances.
1414
return self.get_full_name()
@@ -39,16 +39,16 @@ def can_edit_problem(self, problem):
3939

4040
def can_view_course_attempts(self, course):
4141
return self.is_teacher(course)
42-
42+
4343
def can_view_course_groups(self, course):
4444
return self.is_teacher(course)
45-
45+
4646
def can_create_course_groups(self, course):
4747
return self.is_teacher(course)
48-
48+
4949
def can_update_course_groups(self, course):
5050
return self.is_teacher(course)
51-
51+
5252
def can_delete_course_groups(self, course):
5353
return self.is_teacher(course)
5454

@@ -71,7 +71,7 @@ def can_view_problem(self, problem):
7171
def can_view_problem_solution(self, problem, student):
7272
return self.can_view_problem(problem) and \
7373
(self == student or self.is_teacher(problem.problem_set.course))
74-
74+
7575
def can_view_course_statistics(self, course):
7676
return self.is_teacher(course)
7777

@@ -81,6 +81,6 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
8181
if created:
8282
Token.objects.create(user=instance)
8383

84-
User._meta.get_field('username').max_length = 70
85-
User._meta.get_field('first_name').max_length = 70
86-
User._meta.get_field('last_name').max_length = 70
84+
User._meta.get_field('username').max_length = 70
85+
User._meta.get_field('first_name').max_length = 70
86+
User._meta.get_field('last_name').max_length = 70

0 commit comments

Comments
 (0)