Skip to content
Snippets Groups Projects
Verified Commit 40d9344c authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Make instruction frontend compatible with new Vue frontend

parent 46670c45
No related branches found
No related tags found
1 merge request!215Draft: Resolve "Instructions can be linked to a document as remarks by the group"
Pipeline #144047 passed with warnings
......@@ -50,4 +50,4 @@
"title": "Kursbuch"
}
}
}
\ No newline at end of file
}
......@@ -158,9 +158,36 @@ export default {
inMenu: true,
titleKey: "alsijil.instruction.menu_title",
icon: "mdi-folder-check-outline",
permission: "alsijil.view_instructions_rule"
}
},
permission: "alsijil.view_instructions_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "instructions/create/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "alsijil.createInstruction",
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "instructions/:pk/edit",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "alsijil.editInstruction",
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "instructions/:pk/delete",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "alsijil.deleteInstruction",
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
{
path: "persons/:id_(\\d+)/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
......
......@@ -31,6 +31,9 @@
},
"all_lessons": {
"menu_title": "Alle Stunden"
},
"instruction": {
"menu_title": "Belehrungen"
}
}
}
......@@ -31,6 +31,9 @@
"all_lessons": {
"menu_title": "All lessons"
},
"menu_title": "Class register"
"menu_title": "Class register",
"instruction": {
"menu_title": "Instructions"
}
}
}
......@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
dependencies = [
('core', '0019_fix_uniqueness_per_site'),
('sites', '0002_alter_domain_unique'),
('alsijil', '0016_add_not_counted_excuse_types'),
('alsijil', '0017_rename_late_to_tardiness'),
]
operations = [
......
......@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
dependencies = [
('core', '0019_fix_uniqueness_per_site'),
('alsijil', '0017_instruction'),
('alsijil', '0018_instruction'),
]
operations = [
......
......@@ -1417,7 +1417,7 @@ class InstructionsListView(PermissionRequiredMixin, FilterView):
for doc in docs:
groups = doc.register_object.get_groups().all()
for group in groups:
parent_groups = group.parent_groups_recursive
parent_groups = group.parent_groups.all() # FIXME Recursive again
group_members = set(group.members.all())
selected_groups = list(parent_groups) + [group]
......
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