Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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-Core
Commits
34e169a5
Verified
Commit
34e169a5
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into fix/add-class-to-el-multiple-classes
parents
d52396d0
a4e097c1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!342
Fix add_class_to_el templatetag to work with lists for classes
Pipeline
#3240
failed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/models.py
+2
-2
2 additions, 2 deletions
aleksis/core/models.py
dev.sh
+1
-1
1 addition, 1 deletion
dev.sh
with
3 additions
and
3 deletions
aleksis/core/models.py
+
2
−
2
View file @
34e169a5
...
...
@@ -9,7 +9,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey
from
django.contrib.contenttypes.models
import
ContentType
from
django.contrib.sites.models
import
Site
from
django.core.exceptions
import
ValidationError
from
django.db
import
models
from
django.db
import
models
,
transaction
from
django.db.models
import
QuerySet
from
django.forms.widgets
import
Media
from
django.urls
import
reverse
...
...
@@ -456,7 +456,7 @@ class Notification(ExtensibleModel):
def
save
(
self
,
**
kwargs
):
super
().
save
(
**
kwargs
)
if
not
self
.
sent
:
send_notification
(
self
.
pk
,
resend
=
True
)
transaction
.
on_commit
(
lambda
:
send_notification
(
self
.
pk
,
resend
=
True
)
)
self
.
sent
=
True
super
().
save
(
**
kwargs
)
...
...
This diff is collapsed.
Click to expand it.
dev.sh
+
1
−
1
View file @
34e169a5
...
...
@@ -28,7 +28,7 @@ case "$1" in
locales
=
"-l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la"
for
d
in
aleksis/core apps/official/
*
/aleksis/apps/
*
;
do
echo
;
echo
"Entering
$d
."
poetry run sh
-c
"cd
$d
;
$manage_py
makemessages --no-wrap -i static
$locales
"
poetry run sh
-c
"cd
$d
;
$manage_py
makemessages --no-wrap
-e html,txt,py,email
-i static
$locales
"
poetry run sh
-c
"cd
$d
;
$manage_py
makemessages --no-wrap -d djangojs
$locales
"
done
exit
...
...
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