Skip to content
Snippets Groups Projects
Commit c8431ea9 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'rename-field-abbrev-to-short_name' into 'master'

Rename abbrev to short_name

Closes AlekSIS-App-Chronos#70

See merge request !42
parents 4bd42763 7832a360
No related branches found
No related tags found
1 merge request!42Rename abbrev to short_name
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<tr> <tr>
<td>{{ note_date }}</td> <td>{{ note_date }}</td>
<td>{{ note.lesson_period.period.period }}</td> <td>{{ note.lesson_period.period.period }}</td>
<td>{{ note.lesson_period.get_subject.abbrev }} </td> <td>{{ note.lesson_period.get_subject.short_name }} </td>
<td>{{ note.lesson_period.get_teachers.first.short_name }}</td> <td>{{ note.lesson_period.get_teachers.first.short_name }}</td>
<td> <td>
{% if note.absent %} {% if note.absent %}
...@@ -293,8 +293,8 @@ ...@@ -293,8 +293,8 @@
<th rowspan="{{ periods|length }}" class="lessons-day-head">{{ day }}</th> <th rowspan="{{ periods|length }}" class="lessons-day-head">{{ day }}</th>
{% endif %} {% endif %}
<td class="lesson-pe">{{ period.period.period }}</td> <td class="lesson-pe">{{ period.period.period }}</td>
<td class="lesson-subj">{{ period.lesson.subject.abbrev }}</td> <td class="lesson-subj">{{ period.lesson.subject.short_name }}</td>
<td class="lesson-subs">{{ substitution.subject.abbrev }}</td> <td class="lesson-subs">{{ substitution.subject.short_name }}</td>
<td class="lesson-topic"> <td class="lesson-topic">
{% if substitution.cancelled %} {% if substitution.cancelled %}
{% trans 'Lesson cancelled' %} {% trans 'Lesson cancelled' %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment