Merge branch '73-add-rules-and-permissions' of...

Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions

aleksis/apps/alsijil/rules.py

@@ -85,7 +85,7 @@ add_perm("alsijil.view_week_personalnote", view_week_personal_notes_predicate)
 register_absence_predicate = has_person & (
     has_global_perm("alsijil.register_absence")
     | has_person_group_object_perm("core.register_absence_group")
-    | has_global_perm("core.register_absence_person")
+    | has_object_perm("core.register_absence_person")
     | is_person_group_owner
 )
 add_perm("alsijil.register_absence", register_absence_predicate)

aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html

@@ -28,11 +28,10 @@
 {% endblock %}
 
 {% block content %}
-<<<<<<< HEAD
   {% 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 %}
-=======
+
   <div class="row">
     <div class="col s12">
       {% with prev_lesson=lesson_period.prev %}
@@ -52,7 +51,6 @@
       {% endwith %}
     </div>
   </div>
->>>>>>> master
 
   <form method="post">
     <div class="row">