Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
6b7a872b
Commit
6b7a872b
authored
2 years ago
by
Jakob Dieterle
Browse files
Options
Downloads
Patches
Plain Diff
fix merge error
parent
d92611b0
Loading
Loading
1 merge request
!244
Resolve "Make exam a many to many field on StudentInfo model"
Pipeline
#299333
passed
2 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/signals.py
+0
-15
0 additions, 15 deletions
core/signals.py
with
0 additions
and
15 deletions
core/signals.py
+
0
−
15
View file @
6b7a872b
...
...
@@ -60,22 +60,7 @@ def update_student_score(sender, instance, **kwargs):
for
exam_info
in
student
.
exams
.
all
():
exam_info
.
update_total_score
()
log
.
debug
(
'
SIGNAL -- Scores of student %s were updated)
'
,
student
)
=======
student
.
exams
[
0
].
update_total_score
()
log
.
debug
(
'
SIGNAL -- Score of student %s was updated %s)
'
,
student
,
student
.
total_score
)
>>>>>>>
added
new
many
-
to
-
many
field
and
wrapper
class
=======
for
exam_info
in
student
.
exams
.
all
():
exam_info
.
update_total_score
()
log
.
debug
(
'
SIGNAL -- Scores of student %s were updated)
'
,
student
)
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
for
exam_info
in
student
.
exams
.
all
():
exam_info
.
update_total_score
()
log
.
debug
(
'
SIGNAL -- Scores of student %s were updated)
'
,
student
)
@receiver
(
pre_save
,
sender
=
FeedbackComment
)
def
set_comment_visibility_after_conflict
(
sender
,
instance
,
**
kwargs
):
...
...
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