Skip to content
Snippets Groups Projects

Resolve "Add rules and permissions"

Merged Jonathan Weth requested to merge 73-add-rules-and-permissions into master
Compare and Show latest version
5 files
+ 58
55
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -24,6 +24,10 @@
{% endblock %}
{% block content %}
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
<form method="post">
<div class="row">
<div class="col s12">
@@ -33,7 +37,6 @@
</div>
</div>
{% csrf_token %}
<div class="row">
<div class="col s12 m12 l6 xl8">
<div class="card">
@@ -41,8 +44,7 @@
<span class="card-title">
{% blocktrans %}Lesson documentation{% endblocktrans %}
</span>
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
{% if can_edit_lesson_documentation %}
{% form form=lesson_documentation_form %}{% endform %}
{% elif can_view_lesson_documentation %}
@@ -90,7 +92,6 @@
<span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
{% form form=personal_note_formset.management_form %}{% endform %}
<table class="striped responsive-table alsijil-table">
@@ -105,9 +106,8 @@
</thead>
<tbody>
{% for form in personal_note_formset %}
<tr>
{% if can_edit_personalnote %}
{% if can_edit_personalnote %}
<tr>
{{ form.id }}
<td>{{ form.person_name }}{{ form.person_name.value }}</td>
<td class="center-align">
@@ -156,12 +156,12 @@
</div>
</div>
<div class="row">
<div class="col s12">
{% if can_edit_lesson_documentation or can_edit_personalnote %}
{% if can_edit_lesson_documentation or can_edit_personalnote %}
<div class="row">
<div class="col s12">
{% include "core/partials/save_button.html" %}
{% endif %}
</div>
</div>
</div>
{% endif %}
</form>
{% endblock %}
Loading