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
Commits
3070497e
Commit
3070497e
authored
2 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '225-seating-plan-integration-uses-wrong-permission-names' into 'master'
Resolve "Seating plan integration uses wrong permission names" Closes
#225
See merge request
!302
parents
ed3002e7
bafbf89a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!302
Resolve "Seating plan integration uses wrong permission names"
Pipeline
#86852
canceled
2 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html
+2
-2
2 additions, 2 deletions
.../templates/alsijil/partials/lesson/tabs/seating_plan.html
with
3 additions
and
2 deletions
CHANGELOG.rst
+
1
−
0
View file @
3070497e
...
...
@@ -17,6 +17,7 @@ Fixed
* Data checks reported all Lesson Documentations as being during Holidays if there was no Holiday object.
* Students were displayed multiple times in class register views.
* Absences were counted multiple times in some class register views.
* Group owners couldn't create new seating plans.
`2.1`_ - 2022-06-25
-------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/seating_plan.html
+
2
−
2
View file @
3070497e
...
...
@@ -55,7 +55,7 @@
<i
class=
"material-icons left small orange-text"
>
warning
</i>
{% trans "There is no seating plan for this lesson." %}
</div>
{% has_perm "stoelindeling.
add
_seatingplan_rule" user first_group as can_add %}
{% has_perm "stoelindeling.
create
_seatingplan_rule" user first_group as can_add %}
{% if can_add %}
<div
class=
"row margin-bottom"
>
<div
class=
"col s12"
>
...
...
@@ -69,7 +69,7 @@
</div>
{% endif %}
{% for parent_group in first_group.parent_groups.all %}
{% has_perm "stoelindeling.
add
_seatingplan_rule" user parent_group as can_add %}
{% has_perm "stoelindeling.
create
_seatingplan_rule" user parent_group as can_add %}
{% if can_add %}
<div
class=
"row"
>
<div
class=
"col s12"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment