Skip to content
Snippets Groups Projects
Commit 6b252b22 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '24-adapt-for-spa-operation' into 'master'

Resolve "Adapt for SPA operation"

Closes #24

See merge request !22
parents c130a2de 86d4a17b
No related branches found
No related tags found
1 merge request!22Resolve "Adapt for SPA operation"
Pipeline #114405 failed
...@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_. ...@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased Unreleased
---------- ----------
Added
~~~~~
* Add SPA support.
`1.0`_ - 2022-06-25 `1.0`_ - 2022-06-25
------------------- -------------------
......
export default
{
meta: {
inMenu: true,
titleKey: "matrix.menu_title",
icon: "mdi-forum-outline",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
children: [
{
path: "rooms/",
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
name: "matrix.groupsAndRooms",
meta: {
inMenu: true,
titleKey: "matrix.rooms.menu_title",
icon: "mdi-account-group-outline",
permission: "matrix.view_matrixrooms_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
],
}
{
"matrix": {
"menu_title": "Matrix",
"rooms": {
"menu_title": "Gruppen und Räume"
}
}
}
{
"matrix": {
"menu_title": "Matrix",
"rooms": {
"menu_title": "Groups and Rooms"
}
}
}
from django.urls import path
from . import views
urlpatterns = [
path("rooms/", views.MatrixRoomListView.as_view(), name="matrix_rooms"),
]
from django.utils.decorators import method_decorator
from django_filters.views import FilterView from django_filters.views import FilterView
from django_tables2 import SingleTableMixin from django_tables2 import SingleTableMixin
from guardian.shortcuts import get_objects_for_user from guardian.shortcuts import get_objects_for_user
...@@ -6,9 +8,11 @@ from rules.contrib.views import PermissionRequiredMixin ...@@ -6,9 +8,11 @@ from rules.contrib.views import PermissionRequiredMixin
from aleksis.apps.matrix.filters import GroupMatrixRoomFilter from aleksis.apps.matrix.filters import GroupMatrixRoomFilter
from aleksis.apps.matrix.forms import GroupMatrixRoomActionForm from aleksis.apps.matrix.forms import GroupMatrixRoomActionForm
from aleksis.apps.matrix.tables import GroupsMatrixRoomsTable from aleksis.apps.matrix.tables import GroupsMatrixRoomsTable
from aleksis.core.decorators import pwa_cache
from aleksis.core.models import Group from aleksis.core.models import Group
@method_decorator(pwa_cache, name="dispatch")
class MatrixRoomListView(PermissionRequiredMixin, SingleTableMixin, FilterView): class MatrixRoomListView(PermissionRequiredMixin, SingleTableMixin, FilterView):
"""Overview about groups and their Matrix rooms.""" """Overview about groups and their Matrix rooms."""
......
...@@ -25,13 +25,13 @@ django.setup() ...@@ -25,13 +25,13 @@ django.setup()
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
project = "AlekSIS-App-Matrix" project = "AlekSIS-App-Matrix"
copyright = "2018-2022 The AlekSIS team" copyright = "2018-2023 The AlekSIS team"
author = "The AlekSIS Team" author = "The AlekSIS Team"
# The short X.Y version # The short X.Y version
version = "1.0" version = "3.0"
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = "1.0.1.dev0" release = "3.0.0.dev0"
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Matrix" name = "AlekSIS-App-Matrix"
version = "1.0.1.dev0" version = "3.0.0.dev0"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -32,7 +32,7 @@ secondary = true ...@@ -32,7 +32,7 @@ secondary = true
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9" python = "^3.9"
aleksis-core = "^2.7" aleksis-core = "^3.0.dev3"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
......
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