Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Merge requests
!49
Resolve "Add rules and permissions"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Add rules and permissions"
73-add-rules-and-permissions
into
master
Overview
72
Commits
106
Pipelines
85
Changes
7
Merged
Jonathan Weth
requested to merge
73-add-rules-and-permissions
into
master
4 years ago
Overview
14
Commits
106
Pipelines
85
Changes
1
Expand
Closes
#73 (closed)
Closes
#79 (closed)
Edited
4 years ago
by
Nik | Klampfradler
0
0
Merge request reports
Compare
version 6
version 85
31fed539
4 years ago
version 84
3d5d957c
4 years ago
version 83
5b288ced
4 years ago
version 82
0985aa3c
4 years ago
version 81
9d6db523
4 years ago
version 80
8af2cfc1
4 years ago
version 79
57be44f2
4 years ago
version 78
f57c83f3
4 years ago
version 77
fe5e0576
4 years ago
version 76
091caa94
4 years ago
version 75
ed1fede6
4 years ago
version 74
34ef43d1
4 years ago
version 73
cff25c97
4 years ago
version 72
120193ca
4 years ago
version 71
45330d48
4 years ago
version 70
e9282bc9
4 years ago
version 69
e4189166
4 years ago
version 68
256bf855
4 years ago
version 67
0319cbcf
4 years ago
version 66
e3d26b7d
4 years ago
version 65
f3206ef4
4 years ago
version 64
df357a62
4 years ago
version 63
ef75d02b
4 years ago
version 62
32ad8b40
4 years ago
version 61
378acd61
4 years ago
version 60
5a900697
4 years ago
version 59
0a2acd87
4 years ago
version 58
0cab5ee3
4 years ago
version 57
fce909de
4 years ago
version 56
ff67a50a
4 years ago
version 55
e1aee095
4 years ago
version 54
66dd2f9c
4 years ago
version 53
0c1b499e
4 years ago
version 52
cbd4e140
4 years ago
version 51
f9ba7388
4 years ago
version 50
f6b135b2
4 years ago
version 49
46259cb0
4 years ago
version 48
46259cb0
4 years ago
version 47
39496545
4 years ago
version 46
25dc771a
4 years ago
version 45
b422dae3
4 years ago
version 44
fc2f0f6c
4 years ago
version 43
f2151ca2
4 years ago
version 42
bd4c962a
4 years ago
version 41
3daf91e8
4 years ago
version 40
4964c534
4 years ago
version 39
9a6d823e
4 years ago
version 38
867088d7
4 years ago
version 37
4ce2f988
4 years ago
version 36
e8144bc6
4 years ago
version 35
910e001c
4 years ago
version 34
87e90a54
4 years ago
version 33
6da0a1a0
4 years ago
version 32
4daa50e1
4 years ago
version 31
f1a5702d
4 years ago
version 30
780fd921
4 years ago
version 29
63c96016
4 years ago
version 28
62c3ea5d
4 years ago
version 27
0292d973
4 years ago
version 26
3d8f9797
4 years ago
version 25
0292d973
4 years ago
version 24
07ca4f09
4 years ago
version 23
26b63e39
4 years ago
version 22
b7fa224e
4 years ago
version 21
262cf49e
4 years ago
version 20
b3df531e
4 years ago
version 19
b1978f7a
4 years ago
version 18
f3cc545c
4 years ago
version 17
fbbb6020
4 years ago
version 16
93203b44
4 years ago
version 15
6b0eedfd
4 years ago
version 14
c8791096
4 years ago
version 13
442e28eb
4 years ago
version 12
287cac5e
4 years ago
version 11
53bfe409
4 years ago
version 10
2011793a
4 years ago
version 9
a95d775a
4 years ago
version 8
45de9a0c
4 years ago
version 7
2a84050c
4 years ago
version 6
451cdb33
4 years ago
version 5
c0e47390
4 years ago
version 4
a85bcae6
4 years ago
version 3
e65b4cb2
4 years ago
version 2
6e338635
4 years ago
version 1
6e338635
4 years ago
master (base)
and
version 7
latest version
47ab315d
106 commits,
4 years ago
version 85
31fed539
105 commits,
4 years ago
version 84
3d5d957c
104 commits,
4 years ago
version 83
5b288ced
103 commits,
4 years ago
version 82
0985aa3c
101 commits,
4 years ago
version 81
9d6db523
100 commits,
4 years ago
version 80
8af2cfc1
100 commits,
4 years ago
version 79
57be44f2
99 commits,
4 years ago
version 78
f57c83f3
98 commits,
4 years ago
version 77
fe5e0576
97 commits,
4 years ago
version 76
091caa94
96 commits,
4 years ago
version 75
ed1fede6
94 commits,
4 years ago
version 74
34ef43d1
93 commits,
4 years ago
version 73
cff25c97
92 commits,
4 years ago
version 72
120193ca
91 commits,
4 years ago
version 71
45330d48
90 commits,
4 years ago
version 70
e9282bc9
89 commits,
4 years ago
version 69
e4189166
88 commits,
4 years ago
version 68
256bf855
84 commits,
4 years ago
version 67
0319cbcf
82 commits,
4 years ago
version 66
e3d26b7d
80 commits,
4 years ago
version 65
f3206ef4
79 commits,
4 years ago
version 64
df357a62
78 commits,
4 years ago
version 63
ef75d02b
77 commits,
4 years ago
version 62
32ad8b40
76 commits,
4 years ago
version 61
378acd61
76 commits,
4 years ago
version 60
5a900697
75 commits,
4 years ago
version 59
0a2acd87
74 commits,
4 years ago
version 58
0cab5ee3
72 commits,
4 years ago
version 57
fce909de
71 commits,
4 years ago
version 56
ff67a50a
70 commits,
4 years ago
version 55
e1aee095
69 commits,
4 years ago
version 54
66dd2f9c
68 commits,
4 years ago
version 53
0c1b499e
67 commits,
4 years ago
version 52
cbd4e140
61 commits,
4 years ago
version 51
f9ba7388
60 commits,
4 years ago
version 50
f6b135b2
59 commits,
4 years ago
version 49
46259cb0
58 commits,
4 years ago
version 48
46259cb0
58 commits,
4 years ago
version 47
39496545
57 commits,
4 years ago
version 46
25dc771a
56 commits,
4 years ago
version 45
b422dae3
55 commits,
4 years ago
version 44
fc2f0f6c
54 commits,
4 years ago
version 43
f2151ca2
53 commits,
4 years ago
version 42
bd4c962a
52 commits,
4 years ago
version 41
3daf91e8
50 commits,
4 years ago
version 40
4964c534
49 commits,
4 years ago
version 39
9a6d823e
48 commits,
4 years ago
version 38
867088d7
47 commits,
4 years ago
version 37
4ce2f988
45 commits,
4 years ago
version 36
e8144bc6
44 commits,
4 years ago
version 35
910e001c
43 commits,
4 years ago
version 34
87e90a54
42 commits,
4 years ago
version 33
6da0a1a0
41 commits,
4 years ago
version 32
4daa50e1
40 commits,
4 years ago
version 31
f1a5702d
39 commits,
4 years ago
version 30
780fd921
38 commits,
4 years ago
version 29
63c96016
35 commits,
4 years ago
version 28
62c3ea5d
34 commits,
4 years ago
version 27
0292d973
32 commits,
4 years ago
version 26
3d8f9797
34 commits,
4 years ago
version 25
0292d973
32 commits,
4 years ago
version 24
07ca4f09
27 commits,
4 years ago
version 23
26b63e39
26 commits,
4 years ago
version 22
b7fa224e
25 commits,
4 years ago
version 21
262cf49e
24 commits,
4 years ago
version 20
b3df531e
22 commits,
4 years ago
version 19
b1978f7a
20 commits,
4 years ago
version 18
f3cc545c
19 commits,
4 years ago
version 17
fbbb6020
18 commits,
4 years ago
version 16
93203b44
17 commits,
4 years ago
version 15
6b0eedfd
16 commits,
4 years ago
version 14
c8791096
14 commits,
4 years ago
version 13
442e28eb
13 commits,
4 years ago
version 12
287cac5e
12 commits,
4 years ago
version 11
53bfe409
7 commits,
4 years ago
version 10
2011793a
6 commits,
4 years ago
version 9
a95d775a
5 commits,
4 years ago
version 8
45de9a0c
3 commits,
4 years ago
version 7
2a84050c
6 commits,
4 years ago
version 6
451cdb33
5 commits,
4 years ago
version 5
c0e47390
3 commits,
4 years ago
version 4
a85bcae6
3 commits,
4 years ago
version 3
e65b4cb2
2 commits,
4 years ago
version 2
6e338635
1 commit,
4 years ago
version 1
6e338635
18 commits,
4 years ago
Show latest version
1 file
+
5
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
5
−
3
Options
@@ -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"
>
@@ -41,8 +45,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 +93,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"
>
Loading