Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Hjelp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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-Hjelp
Commits
35baeb9e
Commit
35baeb9e
authored
2 months ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'check/update-tox-ini' into 'master'
Update tox.ini See merge request
!150
parents
d4ae34f3
36aba5a2
No related branches found
Branches containing commit
No related tags found
1 merge request
!150
Update tox.ini
Pipeline
#195602
failed
2 months ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: deploy
Pipeline: AlekSIS
#195605
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/hjelp/views.py
+4
-4
4 additions, 4 deletions
aleksis/apps/hjelp/views.py
tox.ini
+6
-3
6 additions, 3 deletions
tox.ini
with
10 additions
and
7 deletions
aleksis/apps/hjelp/views.py
+
4
−
4
View file @
35baeb9e
from
typing
import
Any
,
Dict
from
typing
import
Any
from
django.contrib
import
messages
from
django.contrib.auth.mixins
import
PermissionRequiredMixin
as
GlobalPermissionRequiredMixin
...
...
@@ -81,7 +81,7 @@ class CreateFAQSection(GlobalPermissionRequiredMixin, AdvancedCreateView):
messages
.
success
(
self
.
request
,
self
.
success_message
)
return
redirect
(
"
order_faq
"
)
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
D
ict
[
str
,
Any
]:
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
d
ict
[
str
,
Any
]:
context
=
super
().
get_context_data
(
**
kwargs
)
context
[
"
title
"
]
=
_
(
"
Create FAQ section
"
)
context
[
"
layout
"
]
=
Layout
(
Row
(
"
name
"
),
Row
(
"
icon
"
),
Row
(
"
show
"
))
...
...
@@ -107,7 +107,7 @@ class CreateFAQQuestion(GlobalPermissionRequiredMixin, AdvancedCreateView):
messages
.
success
(
self
.
request
,
self
.
success_message
)
return
redirect
(
"
order_faq
"
)
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
D
ict
[
str
,
Any
]:
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
d
ict
[
str
,
Any
]:
context
=
super
().
get_context_data
(
**
kwargs
)
context
[
"
title
"
]
=
_
(
"
Create FAQ question
"
)
context
[
"
layout
"
]
=
Layout
(
...
...
@@ -124,7 +124,7 @@ class UpdateFAQQuestion(GlobalPermissionRequiredMixin, AdvancedEditView):
success_url
=
reverse_lazy
(
"
order_faq
"
)
permission_required
=
"
hjelp.change_faq_rule
"
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
D
ict
[
str
,
Any
]:
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
d
ict
[
str
,
Any
]:
context
=
super
().
get_context_data
(
**
kwargs
)
context
[
"
title
"
]
=
_
(
"
Edit FAQ question
"
)
context
[
"
layout
"
]
=
Layout
(
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
6
−
3
View file @
35baeb9e
[tox]
skipsdist
=
True
skip_missing_interpreters
=
true
envlist
=
py39,
py310,py311
envlist
=
py310,py311
,py312
[testenv]
allowlist_externals
=
...
...
@@ -24,12 +24,13 @@ setenv =
[testenv:lint]
commands_pre
=
poetry
install
--only
=
dev
poetry
install
yarnpkg
--cwd
=
.dev-js
commands
=
poetry
run
ruff
check
{posargs}
aleksis/
yarnpkg
--cwd
=
.dev-js run prettier --ignore-path={toxinidir}/.prettierignore {posargs} --check ..
yarnpkg
--cwd
=
.dev-js run eslint ../aleksis/**/*/frontend/**/*.{js,vue} --config={toxinidir}/.eslintrc.js --resolve-plugins-relative-to=.
poetry
run
aleksis-admin
graphql_schema
--schema
aleksis.core.schema.schema
--out
.dev-js/schema.json
yarnpkg
--cwd
=
.dev-js run eslint ../aleksis/**/*/frontend/**/*.{js,vue,graphql} --config={toxinidir}/.dev-js/.eslintrc.js
[testenv:security]
commands_pre
=
...
...
@@ -42,6 +43,8 @@ commands =
commands_pre
=
poetry
install
poetry
run
sh
-c
"cd
aleksis
; aleksis-admin compilemessages"
poetry
run
aleksis-admin
yarn
install
poetry
run
aleksis-admin
compile_scss
commands
=
poetry build
[testenv:docs]
...
...
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