aleksis/AlekSIS-App-Vereinsmeier
8
0
Fork 0
Code Issues 5 Pull requests 3 Projects Releases Packages Activity Actions

Resolve "Move Organisation to Core" #19

Open
lukasw wants to merge 3 commits from 3-move-organisation-to-core into master
pull from: 3-move-organisation-to-core
merge into: aleksis:master
Conversation 16 Commits 3 Files changed 4 +463 -27
lukasw commented 2023-03-15 19:30:19 +01:00 (Migrated from edugit.org)
Copy link

Closes #3

Closes #3
lukasw commented 2023-03-15 19:30:19 +01:00 (Migrated from edugit.org)
Copy link

assigned to @lukasw

assigned to @lukasw
lukasw commented 2023-03-15 19:32:48 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 412d7001 - Alter Organisation Model

Compare with previous version

added 1 commit <ul><li>412d7001 - Alter Organisation Model</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=28784&start_sha=62857eeaf7110ace143f5d8825a3015067ee4e0e)
lukasw commented 2023-04-05 18:54:27 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 3bcb3969 - Move organisation model to core

Compare with previous version

added 1 commit <ul><li>3bcb3969 - Move organisation model to core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=29100&start_sha=412d70012b7f76464974d9b9dcb643353afd322c)
lukasw commented 2023-08-04 21:07:48 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 8c369345 - Move organisation model to core

Compare with previous version

added 1 commit <ul><li>8c369345 - Move organisation model to core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=33483&start_sha=3bcb3969c228a2094d08cd6464cf5ec623f76479)
lukasw commented 2023-08-09 19:33:17 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 9fc6b72b - Move organisation model to core

Compare with previous version

added 1 commit <ul><li>9fc6b72b - Move organisation model to core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=33554&start_sha=8c369345aa71939a2c40af20462818830335a601)
lukasw commented 2023-08-09 19:59:28 +02:00 (Migrated from edugit.org)
Copy link

Currently there is a strange bug:

atch.py", line 137, in inner                                                                                      [31/1079]
    return original(cursor, sql, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend
s/utils.py", line 67, in execute
    return self._execute_with_wrappers(
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend
s/utils.py", line 80, in _execute_with_wrappers
    return executor(sql, params, many, context)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend
s/utils.py", line 84, in _execute
    with self.db.wrap_database_errors:
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/utils.p
y", line 91, in __exit__
    raise dj_exc_value.with_traceback(traceback) from exc_value
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend
s/utils.py", line 87, in _execute
    return self.cursor.execute(sql)
           ^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django_prometheus
/db/common.py", line 69, in execute
    return super().execute(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
django.db.utils.OperationalError: FEHLER:  ALTER TABLE mit Relation »core_group« nicht möglich, weil es anstehende Trigger-
Ereignisse dafür gibt
Currently there is a strange bug: ``` atch.py", line 137, in inner [31/1079] return original(cursor, sql, *args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend s/utils.py", line 67, in execute return self._execute_with_wrappers( ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend s/utils.py", line 80, in _execute_with_wrappers return executor(sql, params, many, context) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend s/utils.py", line 84, in _execute with self.db.wrap_database_errors: File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/utils.p y", line 91, in __exit__ raise dj_exc_value.with_traceback(traceback) from exc_value File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django/db/backend s/utils.py", line 87, in _execute return self.cursor.execute(sql) ^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/lukas/.cache/pypoetry/virtualenvs/aleksis-core-Lis-uPma-py3.11/lib/python3.11/site-packages/django_prometheus /db/common.py", line 69, in execute return super().execute(*args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ django.db.utils.OperationalError: FEHLER: ALTER TABLE mit Relation »core_group« nicht möglich, weil es anstehende Trigger- Ereignisse dafür gibt ```
lukasw commented 2023-08-14 20:57:22 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 73c41529 - Move organisation model to core

Compare with previous version

added 1 commit <ul><li>73c41529 - Move organisation model to core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=33714&start_sha=9fc6b72b4de4d77774013e49ff93b743f254ecb7)
lukasw commented 2023-08-14 21:13:42 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • a099e882 - Move organisation model to core

Compare with previous version

added 1 commit <ul><li>a099e882 - Move organisation model to core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=33716&start_sha=73c415297701d63f82de9a45ff619ed179d030a0)
lukasw commented 2023-09-30 11:56:14 +02:00 (Migrated from edugit.org)
Copy link

added 16 commits

  • a099e882...e44ebcee - 15 commits from branch master
  • e423aaf3 - Merge branch 'master' into 3-move-organisation-to-core

Compare with previous version

added 16 commits <ul><li>a099e882...e44ebcee - 15 commits from branch <code>master</code></li><li>e423aaf3 - Merge branch &#39;master&#39; into 3-move-organisation-to-core</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=34650&start_sha=a099e882cd85c8e967bccb412831baf2444a0068)
lukasw commented 2023-09-30 12:04:34 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • d680aeac - Move migration to match master

Compare with previous version

added 1 commit <ul><li>d680aeac - Move migration to match master</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=34652&start_sha=e423aaf3e104c22cfdf8255399a91c60abf0fb6a)
lukasw commented 2023-09-30 12:05:57 +02:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2023-09-30 16:17:08 +02:00 (Migrated from edugit.org)
Copy link

What is 'i.related_group_idif it's not anint? If it's None, please use if i.related_group_id`.

What is 'i.related_group_id` if it's not an `int`? If it's `None`, please use `if i.related_group_id`.
lukasw commented 2023-10-04 09:14:40 +02:00 (Migrated from edugit.org)
Copy link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=34722&start_sha=d680aeac262b274040645937f7f21bfd72ff058d#694d0de97a1c6c7a7ae4e04d9d9fe87119bb9eb5_27_27)
lukasw commented 2023-10-04 09:14:42 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • ab2f2d48 - Move migration to match master

Compare with previous version

added 1 commit <ul><li>ab2f2d48 - Move migration to match master</li></ul> [Compare with previous version](/AlekSIS/onboarding/AlekSIS-App-Vereinsmeier/-/merge_requests/9/diffs?diff_id=34722&start_sha=d680aeac262b274040645937f7f21bfd72ff058d)
lukasw commented 2023-10-04 09:22:27 +02:00 (Migrated from edugit.org)
Copy link

resolved all threads

resolved all threads
nik commented 2025-11-27 10:48:02 +01:00 (Migrated from edugit.org)
Copy link

unassigned @lukasw

unassigned @lukasw
This pull request has changes conflicting with the target branch.
  • CHANGELOG.rst
  • aleksis/apps/vereinsmeier/models.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 3-move-organisation-to-core:3-move-organisation-to-core
git switch 3-move-organisation-to-core
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
bug
 Bug

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
bug
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-App-Vereinsmeier!19
No description provided.