From c7d5e841c169722d3510871a6ee36ac244fbac1c Mon Sep 17 00:00:00 2001 From: kjh Date: Thu, 1 Feb 2024 17:45:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20#432=20=ED=9A=8C=EC=9B=90=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C=20=EC=8B=9C?= =?UTF-8?q?,=20=EC=95=88=EB=82=B4=EB=AC=B8=EA=B5=AC=20=EC=B0=BD=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/member_profile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bbs/member_profile.py b/bbs/member_profile.py index 1107fbdeb..0e18b712f 100644 --- a/bbs/member_profile.py +++ b/bbs/member_profile.py @@ -206,14 +206,15 @@ async def member_profile_save( member_form.mb_adult = 0 db.execute( - update(Member) - .values(member_form.__dict__) + update(Member).values(member_form.__dict__) .where(Member.mb_id == mb_id) ) db.commit() + if "ss_profile_change" in request.session: del request.session["ss_profile_change"] - return RedirectResponse(url="/", status_code=302) + + raise AlertException("회원정보가 수정되었습니다.", 302, "/") def get_is_phone_certify(member: Member, config: Config) -> bool: From d1946e6e4a7a27d914512d2c85f1292380b8aefc Mon Sep 17 00:00:00 2001 From: kjh Date: Thu, 1 Feb 2024 18:04:14 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[style]=20#431=20=EC=AA=BD=EC=A7=80=20>=20?= =?UTF-8?q?=EC=96=B4=EC=83=89=ED=95=9C=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 쪽지 보내기 -> 쪽지 쓰기 - 쪽지 없을 경우, 받은/보낸 쪽지 문구 표시 - 타이틀에 편지 아이콘 추가 - 띄어쓰기 --- templates/basic/memo/memo_form.html | 10 +++++----- templates/basic/memo/memo_list.html | 21 +++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/templates/basic/memo/memo_form.html b/templates/basic/memo/memo_form.html index c965b6911..146cdee8d 100644 --- a/templates/basic/memo/memo_form.html +++ b/templates/basic/memo/memo_form.html @@ -4,20 +4,20 @@ {% block content %}
-

쪽지 보내기

+

쪽지 쓰기

-

쪽지쓰기

+

쪽지 쓰기

  • diff --git a/templates/basic/memo/memo_list.html b/templates/basic/memo/memo_list.html index 84b24c382..4d63ee626 100644 --- a/templates/basic/memo/memo_list.html +++ b/templates/basic/memo/memo_list.html @@ -1,27 +1,24 @@ {% extends "base_sub.html" %} {% import "/sideview/macros.html" as sideview %} +{% set action='받은' if kind == "recv" else '보낸' %} {% block title %}내 쪽지함{% endblock title %} {% block content %}

    - 내 쪽지함 + 내 쪽지함
    - {% if kind == "recv" %} - 전체 받은쪽지 - {% else %} - 전체 보낸쪽지 - {% endif %} - {{ total_records|number_format }}통 + 전체 {{ action }}쪽지 + {{ total_records|number_format }}통

      @@ -51,7 +48,7 @@

      삭제 {% else %} -
    • 쪽지가 없습니다.
      • +
    • {{ action }} 쪽지가 없습니다.
      • {% endfor %}

    @@ -64,7 +61,7 @@

    - +

    From 5b69fd79d9710865ed5ec71df4b58d829d87231d Mon Sep 17 00:00:00 2001 From: kjh Date: Tue, 13 Feb 2024 11:38:02 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20#439=20=EA=B2=8C=EC=8B=9C=ED=8C=90?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20>=20=EC=A0=9C=EB=AA=A9=EA=B8=B8?= =?UTF-8?q?=EC=9D=B4=20=EC=A0=9C=ED=95=9C=20=EA=B8=B0=EB=8A=A5=EB=88=84?= =?UTF-8?q?=EB=9D=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/basic/board/basic/list_post.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/basic/board/basic/list_post.html b/templates/basic/board/basic/list_post.html index 0f4fc053c..4ff47d950 100644 --- a/templates/basic/board/basic/list_post.html +++ b/templates/basic/board/basic/list_post.html @@ -200,7 +200,7 @@

    {{ board.subject }} 카테고리

    {% if "secret" in write.wr_option %} {% endif %} - {{ write.wr_subject }} + {{ write.subject }} {% if write.icon_new %}N새글{% endif %} {% if write.icon_hot %}{% endif %} {% if write.icon_file %}{% endif %} From aec40c597253ef72387fafe1556910d56b86cd88 Mon Sep 17 00:00:00 2001 From: kjh Date: Tue, 13 Feb 2024 12:00:09 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20#445=20=EA=B2=8C=EC=8B=9C=ED=8C=90,?= =?UTF-8?q?=20Q&A=20=EB=82=A0=EC=A7=9C=ED=91=9C=EA=B8=B0=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SQLite에서 날짜형식이 다르게 표기되는 문제 해결 --- templates/basic/board/basic/read_post.html | 12 ++++++++---- templates/basic/board/gallery/read_post.html | 12 ++++++++---- templates/basic/qa/qa_list.html | 2 +- templates/basic/qa/qa_view.html | 7 ++++--- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/templates/basic/board/basic/read_post.html b/templates/basic/board/basic/read_post.html index 3c88f99c8..bc856715d 100644 --- a/templates/basic/board/basic/read_post.html +++ b/templates/basic/board/basic/read_post.html @@ -47,7 +47,11 @@

    페이지 정보


    댓글 {{ write.wr_comment|number_format }}건 조회 {{ write.wr_hit|number_format }}회 - 작성일 {{ write.wr_datetime }} + + 작성일 + + {{ write.wr_datetime|datetime_format }} +
@@ -188,7 +192,7 @@

첨부파일

{{ file.bf_source }} ({{ file.bf_filesize|filesizeformat }})
- {{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime }} + {{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime|datetime_format }} {% endfor %} @@ -223,7 +227,7 @@

관련링크

이전글 {{ prev.wr_subject }} - {{ prev.wr_datetime }} + {{ prev.wr_datetime|datetime_format }}

@@ -234,7 +238,7 @@

관련링크

다음글 {{ next.wr_subject }} - {{ next.wr_datetime }} + {{ next.wr_datetime|datetime_format }}

diff --git a/templates/basic/board/gallery/read_post.html b/templates/basic/board/gallery/read_post.html index 2f18a7f75..c73173806 100644 --- a/templates/basic/board/gallery/read_post.html +++ b/templates/basic/board/gallery/read_post.html @@ -47,7 +47,11 @@

페이지 정보


댓글 {{ write.wr_comment|number_format }}건 조회 {{ write.wr_hit|number_format }}회 - 작성일 {{ write.wr_datetime }} + + 작성일 + + {{ write.wr_datetime|datetime_format }} +
@@ -188,7 +192,7 @@

첨부파일

{{ file.bf_source }} ({{ file.bf_filesize|filesizeformat }})
- {{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime }} + {{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime|datetime_format }} {% endfor %} @@ -223,7 +227,7 @@

관련링크

이전글 {{ prev.wr_subject }} - {{ prev.wr_datetime }} + {{ prev.wr_datetime|datetime_format }}

@@ -234,7 +238,7 @@

관련링크

다음글 {{ next.wr_subject }} - {{ next.wr_datetime }} + {{ next.wr_datetime|datetime_format }}

diff --git a/templates/basic/qa/qa_list.html b/templates/basic/qa/qa_list.html index f8e1c4018..f47d76a3a 100644 --- a/templates/basic/qa/qa_list.html +++ b/templates/basic/qa/qa_list.html @@ -130,7 +130,7 @@

검색

{{ qa.qa_name }} - {{ qa.qa_datetime }} + {{ qa.qa_datetime|datetime_format('%y-%m-%d') }} {% if qa.qa_status %} 답변완료 diff --git a/templates/basic/qa/qa_view.html b/templates/basic/qa/qa_view.html index ee0e80d66..66b6e885a 100644 --- a/templates/basic/qa/qa_view.html +++ b/templates/basic/qa/qa_view.html @@ -26,7 +26,7 @@

페이지 정보

작성자 {{ qa.qa_name }} 작성일 - {{ qa.qa_datetime }} + {{ qa.qa_datetime|datetime_format }} {% if qa.qa_email %} 이메일 {{ qa.qa_email }} @@ -139,7 +139,8 @@

첨부파일

답변 {{ answer.qa_subject }}

- {{ answer.qa_datetime }} + + {{ answer.qa_datetime|datetime_format }}
{% if request.state.is_super_admin %}
@@ -275,7 +276,7 @@

연관질문

{{ related.qa_subject }} - {{ related.qa_datetime }} + {{ related.qa_datetime|datetime_format('%y-%m-%d') }} {% if related.qa_status %} 답변완료