Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not assume active DB when not specified #210

Merged
merged 14 commits into from
Nov 26, 2022
Merged

Do not assume active DB when not specified #210

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f9e17e2
Do not assume active DB when not specified
VaZark Nov 22, 2022
159750c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2022
51d112c
Add db routing test case
VaZark Nov 23, 2022
65f9eb5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 23, 2022
eeb2a30
one more test
VaZark Nov 23, 2022
e6fe835
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 23, 2022
1897c7c
use assertRaises instead of expectedFailure
VaZark Nov 24, 2022
b8da8ff
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2022
7e024dc
Catch a general exception for django < 2.0
VaZark Nov 24, 2022
52590af
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 24, 2022
8052e21
use `with` instead of callable
VaZark Nov 25, 2022
66635b4
skip test for django < 2.0
VaZark Nov 25, 2022
0cd7c23
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 25, 2022
bc95b3c
remove repeated test
VaZark Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions admin_interface/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ def pre_save_handler(instance, **kwargs):
pass

@staticmethod
def get_active_theme(database="default"):
objs_manager = Theme.objects.using(database)
def get_active_theme(database=None):
objs_manager = (
Theme.objects if database is None else Theme.objects.using(database)
)
objs_active_qs = objs_manager.filter(active=True)
objs_active_ls = list(objs_active_qs)
objs_active_count = len(objs_active_ls)
Expand Down