diff --git a/A_core/__pycache__/__init__.cpython-313.pyc b/A_core/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..44b9176 Binary files /dev/null and b/A_core/__pycache__/__init__.cpython-313.pyc differ diff --git a/A_core/__pycache__/settings.cpython-313.pyc b/A_core/__pycache__/settings.cpython-313.pyc new file mode 100644 index 0000000..9c81245 Binary files /dev/null and b/A_core/__pycache__/settings.cpython-313.pyc differ diff --git a/A_core/__pycache__/urls.cpython-313.pyc b/A_core/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..229ca03 Binary files /dev/null and b/A_core/__pycache__/urls.cpython-313.pyc differ diff --git a/A_core/__pycache__/wsgi.cpython-313.pyc b/A_core/__pycache__/wsgi.cpython-313.pyc new file mode 100644 index 0000000..7fcfa0a Binary files /dev/null and b/A_core/__pycache__/wsgi.cpython-313.pyc differ diff --git a/B_main/__pycache__/__init__.cpython-313.pyc b/B_main/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..beb35f5 Binary files /dev/null and b/B_main/__pycache__/__init__.cpython-313.pyc differ diff --git a/B_main/__pycache__/admin.cpython-313.pyc b/B_main/__pycache__/admin.cpython-313.pyc new file mode 100644 index 0000000..f892a6d Binary files /dev/null and b/B_main/__pycache__/admin.cpython-313.pyc differ diff --git a/B_main/__pycache__/apps.cpython-313.pyc b/B_main/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..320c6a5 Binary files /dev/null and b/B_main/__pycache__/apps.cpython-313.pyc differ diff --git a/B_main/__pycache__/forms.cpython-313.pyc b/B_main/__pycache__/forms.cpython-313.pyc new file mode 100644 index 0000000..574505b Binary files /dev/null and b/B_main/__pycache__/forms.cpython-313.pyc differ diff --git a/B_main/__pycache__/forms.cpython-38.pyc b/B_main/__pycache__/forms.cpython-38.pyc index a50aa67..42ad4d2 100644 Binary files a/B_main/__pycache__/forms.cpython-38.pyc and b/B_main/__pycache__/forms.cpython-38.pyc differ diff --git a/B_main/__pycache__/models.cpython-313.pyc b/B_main/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000..5ab7e18 Binary files /dev/null and b/B_main/__pycache__/models.cpython-313.pyc differ diff --git a/B_main/__pycache__/peopleinfo.cpython-313.pyc b/B_main/__pycache__/peopleinfo.cpython-313.pyc new file mode 100644 index 0000000..f4c65cf Binary files /dev/null and b/B_main/__pycache__/peopleinfo.cpython-313.pyc differ diff --git a/B_main/__pycache__/urls.cpython-313.pyc b/B_main/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..7245f76 Binary files /dev/null and b/B_main/__pycache__/urls.cpython-313.pyc differ diff --git a/B_main/__pycache__/views.cpython-313.pyc b/B_main/__pycache__/views.cpython-313.pyc new file mode 100644 index 0000000..5b93332 Binary files /dev/null and b/B_main/__pycache__/views.cpython-313.pyc differ diff --git a/B_main/__pycache__/views.cpython-38.pyc b/B_main/__pycache__/views.cpython-38.pyc index 3b5fdb2..b674b01 100644 Binary files a/B_main/__pycache__/views.cpython-38.pyc and b/B_main/__pycache__/views.cpython-38.pyc differ diff --git a/B_main/migrations/__pycache__/0001_initial.cpython-313.pyc b/B_main/migrations/__pycache__/0001_initial.cpython-313.pyc new file mode 100644 index 0000000..24c6bd3 Binary files /dev/null and b/B_main/migrations/__pycache__/0001_initial.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0002_person_user.cpython-313.pyc b/B_main/migrations/__pycache__/0002_person_user.cpython-313.pyc new file mode 100644 index 0000000..fe81406 Binary files /dev/null and b/B_main/migrations/__pycache__/0002_person_user.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0003_person_보일지여부_alter_person_사진.cpython-313.pyc b/B_main/migrations/__pycache__/0003_person_보일지여부_alter_person_사진.cpython-313.pyc new file mode 100644 index 0000000..75e3a63 Binary files /dev/null and b/B_main/migrations/__pycache__/0003_person_보일지여부_alter_person_사진.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0004_person_회원가입상태_alter_person_사진.cpython-313.pyc b/B_main/migrations/__pycache__/0004_person_회원가입상태_alter_person_사진.cpython-313.pyc new file mode 100644 index 0000000..3c67e0e Binary files /dev/null and b/B_main/migrations/__pycache__/0004_person_회원가입상태_alter_person_사진.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0005_person_keyword1_person_keyword2_person_keyword3.cpython-313.pyc b/B_main/migrations/__pycache__/0005_person_keyword1_person_keyword2_person_keyword3.cpython-313.pyc new file mode 100644 index 0000000..45cdbce Binary files /dev/null and b/B_main/migrations/__pycache__/0005_person_keyword1_person_keyword2_person_keyword3.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0006_person_모든사람보기권한.cpython-313.pyc b/B_main/migrations/__pycache__/0006_person_모든사람보기권한.cpython-313.pyc new file mode 100644 index 0000000..bf0b4e4 Binary files /dev/null and b/B_main/migrations/__pycache__/0006_person_모든사람보기권한.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0007_remove_person_보일지여부.cpython-313.pyc b/B_main/migrations/__pycache__/0007_remove_person_보일지여부.cpython-313.pyc new file mode 100644 index 0000000..d8fee29 Binary files /dev/null and b/B_main/migrations/__pycache__/0007_remove_person_보일지여부.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0008_remove_person_회원가입상태.cpython-313.pyc b/B_main/migrations/__pycache__/0008_remove_person_회원가입상태.cpython-313.pyc new file mode 100644 index 0000000..8052774 Binary files /dev/null and b/B_main/migrations/__pycache__/0008_remove_person_회원가입상태.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0009_remove_person_keyword2_remove_person_keyword3_and_more.cpython-313.pyc b/B_main/migrations/__pycache__/0009_remove_person_keyword2_remove_person_keyword3_and_more.cpython-313.pyc new file mode 100644 index 0000000..444b297 Binary files /dev/null and b/B_main/migrations/__pycache__/0009_remove_person_keyword2_remove_person_keyword3_and_more.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/0010_alter_person_options_person_비밀번호설정필요.cpython-313.pyc b/B_main/migrations/__pycache__/0010_alter_person_options_person_비밀번호설정필요.cpython-313.pyc new file mode 100644 index 0000000..99fb7b2 Binary files /dev/null and b/B_main/migrations/__pycache__/0010_alter_person_options_person_비밀번호설정필요.cpython-313.pyc differ diff --git a/B_main/migrations/__pycache__/__init__.cpython-313.pyc b/B_main/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..66ce607 Binary files /dev/null and b/B_main/migrations/__pycache__/__init__.cpython-313.pyc differ diff --git a/B_main/views.py b/B_main/views.py index fe74996..33e8352 100644 --- a/B_main/views.py +++ b/B_main/views.py @@ -69,6 +69,7 @@ def check_authentication(request): def main(request): + print('def main(request):') auth_check = check_authentication(request) if auth_check: return auth_check @@ -89,12 +90,19 @@ def main(request): ) # 현재 사용자의 권한에 따라 추가 필터 적용 - if current_user_person and not current_user_person.모든사람보기권한: - # 모든사람보기권한이 False인 경우 회원가입한 사람만 표시 (user가 있는 사람들) + print(f"[DEBUG] 사용자: {request.user.username}, 슈퍼유저: {request.user.is_superuser}") + print(f"[DEBUG] current_user_person: {current_user_person}") + + # 슈퍼유저이거나 Person 객체가 없는 경우 모든 사람 표시 + if request.user.is_superuser or current_user_person is None: + print(f"[DEBUG] 슈퍼유저 또는 Person 객체 없음 - 모든 사람 표시 모드") + # 모든 사람 표시 (필터 추가 없음) + elif current_user_person and not current_user_person.모든사람보기권한: + # 모든사람보기권한이 False인 경우 회원가입한 사람만 표시 base_filter = base_filter.filter(user__isnull=False) print(f"[DEBUG] 회원가입자만 표시 모드: {current_user_person.이름}") else: - print(f"[DEBUG] 모든 사람 표시 모드") + print(f"[DEBUG] 모든 사람 표시 모드 (모든사람보기권한: {current_user_person.모든사람보기권한})") # 순서가 있는 항목을 먼저 보여주고, 나머지는 가나다순으로 정렬 people = base_filter.annotate( @@ -106,9 +114,11 @@ def main(request): ).order_by('sequence_order', 'SEQUENCE', '이름') print(f"[DEBUG] 메인 페이지 표시: {people.count()}명") + print(f"[DEBUG] === 표시되는 사람들 ===") for person in people: status = "회원가입" if person.user else "미가입" - print(f"[DEBUG] - {person.이름} (상태: {status})") + print(f"[DEBUG] - {person.이름} (상태: {status}, 소속: {person.소속})") + print(f"[DEBUG] === 표시 끝 ===") return render(request, 'B_main/main.htm', {'people': people}) diff --git a/C_accounts/__pycache__/__init__.cpython-313.pyc b/C_accounts/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..39244e8 Binary files /dev/null and b/C_accounts/__pycache__/__init__.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/admin.cpython-313.pyc b/C_accounts/__pycache__/admin.cpython-313.pyc new file mode 100644 index 0000000..ca0bb07 Binary files /dev/null and b/C_accounts/__pycache__/admin.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/apps.cpython-313.pyc b/C_accounts/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..66ac349 Binary files /dev/null and b/C_accounts/__pycache__/apps.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/forms.cpython-313.pyc b/C_accounts/__pycache__/forms.cpython-313.pyc new file mode 100644 index 0000000..38cbf07 Binary files /dev/null and b/C_accounts/__pycache__/forms.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/middleware.cpython-313.pyc b/C_accounts/__pycache__/middleware.cpython-313.pyc new file mode 100644 index 0000000..65224e5 Binary files /dev/null and b/C_accounts/__pycache__/middleware.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/models.cpython-313.pyc b/C_accounts/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000..dc65266 Binary files /dev/null and b/C_accounts/__pycache__/models.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/signals.cpython-313.pyc b/C_accounts/__pycache__/signals.cpython-313.pyc new file mode 100644 index 0000000..d34cb5b Binary files /dev/null and b/C_accounts/__pycache__/signals.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/urls.cpython-313.pyc b/C_accounts/__pycache__/urls.cpython-313.pyc new file mode 100644 index 0000000..4394df4 Binary files /dev/null and b/C_accounts/__pycache__/urls.cpython-313.pyc differ diff --git a/C_accounts/__pycache__/views.cpython-313.pyc b/C_accounts/__pycache__/views.cpython-313.pyc new file mode 100644 index 0000000..53a5c3e Binary files /dev/null and b/C_accounts/__pycache__/views.cpython-313.pyc differ diff --git a/C_accounts/migrations/__pycache__/__init__.cpython-313.pyc b/C_accounts/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..343e99e Binary files /dev/null and b/C_accounts/migrations/__pycache__/__init__.cpython-313.pyc differ diff --git a/C_accounts/templatetags/__pycache__/__init__.cpython-313.pyc b/C_accounts/templatetags/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..eb1d255 Binary files /dev/null and b/C_accounts/templatetags/__pycache__/__init__.cpython-313.pyc differ diff --git a/C_accounts/templatetags/__pycache__/form_filters.cpython-313.pyc b/C_accounts/templatetags/__pycache__/form_filters.cpython-313.pyc new file mode 100644 index 0000000..452b5af Binary files /dev/null and b/C_accounts/templatetags/__pycache__/form_filters.cpython-313.pyc differ diff --git a/db.sqlite3 b/db.sqlite3 index 18c4f38..16377e3 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ