GitHub Actions commited on
Commit
35c5064
ยท
1 Parent(s): 29964a7

Auto-deploy from GitHub Actions - 2025-12-12 07:12:05

Browse files
Files changed (2) hide show
  1. app/routes.py +9 -3
  2. templates/index.html +2 -1
app/routes.py CHANGED
@@ -4290,11 +4290,17 @@ def get_files():
4290
 
4291
  # ์›๋ณธ ํŒŒ์ผ๋งŒ ์กฐํšŒ (parent_file_id๊ฐ€ None์ธ ํŒŒ์ผ)
4292
  # ๊ด€๋ฆฌ์ž๊ฐ€ ์•„๋‹Œ ๊ฒฝ์šฐ ๊ณต๊ฐœ ํŒŒ์ผ๋งŒ ์กฐํšŒ, ๊ด€๋ฆฌ์ž๋Š” ๋ชจ๋“  ํŒŒ์ผ ์กฐํšŒ ๊ฐ€๋Šฅ
4293
- if public_only or (not current_user.is_admin):
 
4294
  query = UploadedFile.query.filter_by(parent_file_id=None, is_public=True)
4295
- print(f"[ํŒŒ์ผ ์กฐํšŒ] ๊ณต๊ฐœ ํŒŒ์ผ๋งŒ ์กฐํšŒ (์‚ฌ์šฉ์ž: {current_user.username}, ๊ด€๋ฆฌ์ž: {current_user.is_admin})")
4296
  else:
4297
  query = UploadedFile.query.filter_by(parent_file_id=None)
 
 
 
 
 
4298
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ๋ชจ๋“  ํŒŒ์ผ ์กฐํšŒ (์‚ฌ์šฉ์ž: {current_user.username}, ๊ด€๋ฆฌ์ž: {current_user.is_admin})")
4299
 
4300
  # ๋ชจ๋ธ ํ•„ํ„ฐ๋ง ์ „ ์ „์ฒด ํŒŒ์ผ ์ˆ˜ ํ™•์ธ
@@ -4305,7 +4311,7 @@ def get_files():
4305
  query = query.filter_by(model_name=model_name)
4306
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ๋ชจ๋ธ '{model_name}' ํ•„ํ„ฐ๋ง")
4307
 
4308
- files = query.order_by(UploadedFile.uploaded_at.desc()).all()
4309
 
4310
  # ํ•„ํ„ฐ๋ง ํ›„ ํŒŒ์ผ ์ˆ˜์™€ ๋ชจ๋ธ๋ช… ํ™•์ธ
4311
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ํ•„ํ„ฐ๋ง ํ›„ ํŒŒ์ผ ์ˆ˜: {len(files)}๊ฐœ")
 
4290
 
4291
  # ์›๋ณธ ํŒŒ์ผ๋งŒ ์กฐํšŒ (parent_file_id๊ฐ€ None์ธ ํŒŒ์ผ)
4292
  # ๊ด€๋ฆฌ์ž๊ฐ€ ์•„๋‹Œ ๊ฒฝ์šฐ ๊ณต๊ฐœ ํŒŒ์ผ๋งŒ ์กฐํšŒ, ๊ด€๋ฆฌ์ž๋Š” ๋ชจ๋“  ํŒŒ์ผ ์กฐํšŒ ๊ฐ€๋Šฅ
4293
+ # ๋ชจ๋ธ ํ•„ํ„ฐ๊ฐ€ ์—†๋Š” ๊ฒฝ์šฐ(์ „์ฒด ๋ชจ๋ธ)์—๋Š” ๊ณต๊ฐœ๋œ ํŒŒ์ผ๋งŒ ์กฐํšŒํ•˜๋„๋ก ๋ณ€๊ฒฝ (์‚ฌ์šฉ์ž ์š”์ฒญ)
4294
+ if public_only or (not current_user.is_admin) or (not model_name and not current_user.is_admin):
4295
  query = UploadedFile.query.filter_by(parent_file_id=None, is_public=True)
4296
+ print(f"[ํŒŒ์ผ ์กฐํšŒ] ๊ณต๊ฐœ ํŒŒ์ผ๋งŒ ์กฐํšŒ (์‚ฌ์šฉ์ž: {current_user.username}, ๊ด€๋ฆฌ์ž: {current_user.is_admin}, ๋ชจ๋ธ: {model_name})")
4297
  else:
4298
  query = UploadedFile.query.filter_by(parent_file_id=None)
4299
+ # ๋ชจ๋ธ์ด ์ง€์ •๋˜์ง€ ์•Š์•˜์ง€๋งŒ ๊ด€๋ฆฌ์ž์ธ ๊ฒฝ์šฐ์—๋„ ๊ณต๊ฐœ ํŒŒ์ผ๋งŒ ๋ณด๊ณ  ์‹ถ์€ ๊ฒฝ์šฐ๋ฅผ ์œ„ํ•ด
4300
+ # ํด๋ผ์ด์–ธํŠธ์—์„œ public_only=true๋ฅผ ๋ณด๋‚ผ ์ˆ˜ ์žˆ์Œ
4301
+ if not model_name and not public_only and current_user.is_admin:
4302
+ # ๊ด€๋ฆฌ์ž๊ฐ€ ์ „์ฒด ๋ชฉ๋ก์„ ๋ณผ ๋•Œ๋Š” ๋ชจ๋“  ํŒŒ์ผ์„ ๋‹ค ๋ณด์—ฌ์คŒ (๊ธฐ์กด ๋กœ์ง ์œ ์ง€)
4303
+ pass
4304
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ๋ชจ๋“  ํŒŒ์ผ ์กฐํšŒ (์‚ฌ์šฉ์ž: {current_user.username}, ๊ด€๋ฆฌ์ž: {current_user.is_admin})")
4305
 
4306
  # ๋ชจ๋ธ ํ•„ํ„ฐ๋ง ์ „ ์ „์ฒด ํŒŒ์ผ ์ˆ˜ ํ™•์ธ
 
4311
  query = query.filter_by(model_name=model_name)
4312
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ๋ชจ๋ธ '{model_name}' ํ•„ํ„ฐ๋ง")
4313
 
4314
+ files = query.order_by(UploadedFile.original_filename.asc()).all()
4315
 
4316
  # ํ•„ํ„ฐ๋ง ํ›„ ํŒŒ์ผ ์ˆ˜์™€ ๋ชจ๋ธ๋ช… ํ™•์ธ
4317
  print(f"[ํŒŒ์ผ ์กฐํšŒ] ํ•„ํ„ฐ๋ง ํ›„ ํŒŒ์ผ ์ˆ˜: {len(files)}๊ฐœ")
templates/index.html CHANGED
@@ -2795,7 +2795,8 @@
2795
  listContainer.innerHTML = '<div style="text-align: center; color: var(--text-secondary); padding: 24px;">์›น์†Œ์„ค ๋ชฉ๋ก์„ ๋ถˆ๋Ÿฌ์˜ค๋Š” ์ค‘...</div>';
2796
 
2797
  try {
2798
- const url = modelName ? `/api/files?model_name=${encodeURIComponent(modelName)}` : '/api/files';
 
2799
  const response = await fetch(url);
2800
  if (!response.ok) throw new Error('์›น์†Œ์„ค ๋ชฉ๋ก์„ ๋ถˆ๋Ÿฌ์˜ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.');
2801
 
 
2795
  listContainer.innerHTML = '<div style="text-align: center; color: var(--text-secondary); padding: 24px;">์›น์†Œ์„ค ๋ชฉ๋ก์„ ๋ถˆ๋Ÿฌ์˜ค๋Š” ์ค‘...</div>';
2796
 
2797
  try {
2798
+ // ์ „์ฒด ๋ชจ๋ธ ์„ ํƒ ์‹œ ๊ณต๊ฐœ๋œ ๋ชจ๋“  ํŒŒ์ผ ์กฐํšŒ (public_only=true)
2799
+ const url = modelName ? `/api/files?model_name=${encodeURIComponent(modelName)}` : '/api/files?public_only=true';
2800
  const response = await fetch(url);
2801
  if (!response.ok) throw new Error('์›น์†Œ์„ค ๋ชฉ๋ก์„ ๋ถˆ๋Ÿฌ์˜ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.');
2802