Skip to content

Commit

Permalink
Merge pull request #449 from gnuboard/fix/error
Browse files Browse the repository at this point in the history
fix: 이슈 > 오류&수정사항 4건 처리
  • Loading branch information
KimTom89 authored Feb 13, 2024
2 parents bc155d6 + 0238a0d commit 47fcd04
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 33 deletions.
7 changes: 4 additions & 3 deletions bbs/member_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/basic/board/basic/list_post.html
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ <h2>{{ board.subject }} 카테고리</h2>
{% if "secret" in write.wr_option %}
<i class="fa fa-lock" aria-hidden="true"></i>
{% endif %}
<a href="{{ url_for('read_post', bo_table=board.bo_table, wr_id=write.wr_id)|set_query_params(request) }}">{{ write.wr_subject }}</a>
<a href="{{ url_for('read_post', bo_table=board.bo_table, wr_id=write.wr_id)|set_query_params(request) }}">{{ write.subject }}</a>
{% if write.icon_new %}<span class="new_icon">N<span class="blind">새글</span></span>{% endif %}
{% if write.icon_hot %}<i class="fa fa-heart" aria-hidden="true"></i>{% endif %}
{% if write.icon_file %}<i class="fa fa-download" aria-hidden="true"></i>{% endif %}
Expand Down
12 changes: 8 additions & 4 deletions templates/basic/board/basic/read_post.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ <h2>페이지 정보</h2>
<br>
<span class="blind">댓글</span><strong><a href="#bo_vc"> <i class="fa fa-regular fa-commenting" aria-hidden="true"></i> {{ write.wr_comment|number_format }}건</a></strong>
<span class="blind">조회</span><strong><i class="fa fa-eye" aria-hidden="true"></i> {{ write.wr_hit|number_format }}회</strong>
<strong class="if_date"><span class="blind">작성일</span><i class="fa fa-regular fa-clock" aria-hidden="true"></i> {{ write.wr_datetime }}</strong>
<strong class="if_date">
<span class="blind">작성일</span>
<i class="fa fa-regular fa-clock" aria-hidden="true"></i>
{{ write.wr_datetime|datetime_format }}
</strong>
</div>
</div>
<!-- 게시물 상단 버튼 시작 { -->
Expand Down Expand Up @@ -188,7 +192,7 @@ <h2>첨부파일</h2>
<strong>{{ file.bf_source }}</strong> ({{ file.bf_filesize|filesizeformat }})
</a>
<br>
<span class="bo_v_file_cnt">{{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime }}</span>
<span class="bo_v_file_cnt">{{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime|datetime_format }}</span>
</li>
{% endfor %}
</ul>
Expand Down Expand Up @@ -223,7 +227,7 @@ <h2>관련링크</h2>
<p>
<span class="nb_tit">이전글</span>
<span class="nb_cont">{{ prev.wr_subject }}</span>
<span class="nb_date">{{ prev.wr_datetime }}</span>
<span class="nb_date">{{ prev.wr_datetime|datetime_format }}</span>
</p>
</a>
</li>
Expand All @@ -234,7 +238,7 @@ <h2>관련링크</h2>
<p>
<span class="nb_tit">다음글</span>
<span class="nb_cont">{{ next.wr_subject }}</span>
<span class="nb_date">{{ next.wr_datetime }}</span>
<span class="nb_date">{{ next.wr_datetime|datetime_format }}</span>
</p>
<i class="fa fa-chevron-down" aria-hidden="true"></i>
</a>
Expand Down
12 changes: 8 additions & 4 deletions templates/basic/board/gallery/read_post.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ <h2>페이지 정보</h2>
<br>
<span class="blind">댓글</span><strong><a href="#bo_vc"> <i class="fa fa-regular fa-commenting" aria-hidden="true"></i> {{ write.wr_comment|number_format }}건</a></strong>
<span class="blind">조회</span><strong><i class="fa fa-eye" aria-hidden="true"></i> {{ write.wr_hit|number_format }}회</strong>
<strong class="if_date"><span class="blind">작성일</span><i class="fa fa-regular fa-clock" aria-hidden="true"></i> {{ write.wr_datetime }}</strong>
<strong class="if_date">
<span class="blind">작성일</span>
<i class="fa fa-regular fa-clock" aria-hidden="true"></i>
{{ write.wr_datetime|datetime_format }}
</strong>
</div>
</div>
<!-- 게시물 상단 버튼 시작 { -->
Expand Down Expand Up @@ -188,7 +192,7 @@ <h2>첨부파일</h2>
<strong>{{ file.bf_source }}</strong> ({{ file.bf_filesize|filesizeformat }})
</a>
<br>
<span class="bo_v_file_cnt">{{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime }}</span>
<span class="bo_v_file_cnt">{{ file.bf_download }}회 다운로드 | DATE : {{ file.bf_datetime|datetime_format }}</span>
</li>
{% endfor %}
</ul>
Expand Down Expand Up @@ -223,7 +227,7 @@ <h2>관련링크</h2>
<p>
<span class="nb_tit">이전글</span>
<span class="nb_cont">{{ prev.wr_subject }}</span>
<span class="nb_date">{{ prev.wr_datetime }}</span>
<span class="nb_date">{{ prev.wr_datetime|datetime_format }}</span>
</p>
</a>
</li>
Expand All @@ -234,7 +238,7 @@ <h2>관련링크</h2>
<p>
<span class="nb_tit">다음글</span>
<span class="nb_cont">{{ next.wr_subject }}</span>
<span class="nb_date">{{ next.wr_datetime }}</span>
<span class="nb_date">{{ next.wr_datetime|datetime_format }}</span>
</p>
<i class="fa fa-chevron-down" aria-hidden="true"></i>
</a>
Expand Down
10 changes: 5 additions & 5 deletions templates/basic/memo/memo_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

{% block content %}
<div id="memo_write" class="new_win">
<h1 id="win_title"><i class="fa fa-regular fa-envelope" aria-hidden="true"></i> 쪽지 보내기</h1>
<h1 id="win_title"><i class="fa fa-regular fa-envelope" aria-hidden="true"></i> 쪽지 쓰기</h1>
<div class="new_win_con2">
<!-- 쪽지함 선택 시작 { -->
<ul class="win_ul">
<li><a href="{{ url_for('memo_list') }}?kind=recv">받은쪽지</a></li>
<li><a href="{{ url_for('memo_list') }}?kind=send">보낸쪽지</a></li>
<li class="selected"><a href="{{ url_for('memo_form') }}">쪽지쓰기</a></li>
<li><a href="{{ url_for('memo_list') }}?kind=recv">받은 쪽지</a></li>
<li><a href="{{ url_for('memo_list') }}?kind=send">보낸 쪽지</a></li>
<li class="selected"><a href="{{ url_for('memo_form') }}">쪽지 쓰기</a></li>
</ul>
<!-- } 쪽지함 선택 끝 -->

<form name="fmemoform" action="{{ url_for('memo_form_update') }}" onsubmit="return fmemoform_submit(this);" method="post" autocomplete="off">
<input type="hidden" name="token" value="">
<div class="form_01">
<h2 class="blind">쪽지쓰기</h2>
<h2 class="blind">쪽지 쓰기</h2>
<ul>
<li>
<label for="me_recv_mb_id" class="blind">받는 회원아이디<strong>필수</strong></label>
Expand Down
21 changes: 9 additions & 12 deletions templates/basic/memo/memo_list.html
Original file line number Diff line number Diff line change
@@ -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 %}
<div id="memo_list" class="new_win">
<h1 id="win_title">
내 쪽지함
<i class="fa fa-regular fa-envelope" aria-hidden="true"></i> 내 쪽지함
<div class="win_total">
{% if kind == "recv" %}
전체 받은쪽지
{% else %}
전체 보낸쪽지
{% endif %}
{{ total_records|number_format }}통
전체 {{ action }}쪽지
{{ total_records|number_format }}통
<br>
</div>
</h1>
<div class="new_win_con2">
<ul class="win_ul">
<li class="{% if kind == "recv" %}selected{% endif %}"><a href="{{ url_for('memo_list') }}?kind=recv">받은쪽지</a></li>
<li class="{% if kind == "send" %}selected{% endif %}"><a href="{{ url_for('memo_list') }}?kind=send">보낸쪽지</a></li>
<li><a href="{{ url_for('memo_form') }}">쪽지쓰기</a></li>
<li class="{% if kind == "recv" %}selected{% endif %}"><a href="{{ url_for('memo_list') }}?kind=recv">받은 쪽지</a></li>
<li class="{% if kind == "send" %}selected{% endif %}"><a href="{{ url_for('memo_list') }}?kind=send">보낸 쪽지</a></li>
<li><a href="{{ url_for('memo_form') }}">쪽지 쓰기</a></li>
</ul>
<div class="memo_list">
<ul>
Expand Down Expand Up @@ -51,7 +48,7 @@ <h1 id="win_title">
<a href="{{ url_for('memo_delete', me_id=memo.me_id) }}?page={{ page }}" onclick="del(this.href); return false;" class="memo_del"><i class="fa fa-regular fa-trash-can" aria-hidden="true"></i> <span class="blind">삭제</span></a>
</li>
{% else %}
<li class="empty_table">쪽지가 없습니다.</li>
<li class="empty_table">{{ action }} 쪽지가 없습니다.</li>
{% endfor %}
</ul>
</div>
Expand All @@ -64,7 +61,7 @@ <h1 id="win_title">
</p>

<div class="win_btn">
<button type="button" onclick="window.close();" class="btn_close">창닫기</button>
<button type="button" onclick="window.close();" class="btn_close">창 닫기</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/basic/qa/qa_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ <h3>검색</h3>
</a>
</td>
<td class="td_name">{{ qa.qa_name }}</td>
<td class="td_date">{{ qa.qa_datetime }}</td>
<td class="td_date">{{ qa.qa_datetime|datetime_format('%y-%m-%d') }}</td>
<td class="td_stat">
{% if qa.qa_status %}
<span class="txt_done">답변완료</span>
Expand Down
7 changes: 4 additions & 3 deletions templates/basic/qa/qa_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2>페이지 정보</h2>
<span class="blind">작성자</span>
<strong> {{ qa.qa_name }}</strong>
<span class="blind">작성일</span>
<strong class="bo_date"><i class="fa fa-regular fa-clock" aria-hidden="true"></i> {{ qa.qa_datetime }}</strong>
<strong class="bo_date"><i class="fa fa-regular fa-clock" aria-hidden="true"></i> {{ qa.qa_datetime|datetime_format }}</strong>
{% if qa.qa_email %}
<span class="blind">이메일</span>
<strong><i class="fa fa-regular fa-envelope" aria-hidden="true"></i> {{ qa.qa_email }}</strong>
Expand Down Expand Up @@ -139,7 +139,8 @@ <h2>첨부파일</h2>
<h2><span class="bo_v_reply">답변</span> {{ answer.qa_subject }}</h2>
<header>
<div id="ans_datetime">
<i class="fa fa-regular fa-clock" aria-hidden="true"></i> {{ answer.qa_datetime }}
<i class="fa fa-regular fa-clock" aria-hidden="true"></i>
{{ answer.qa_datetime|datetime_format }}
</div>
{% if request.state.is_super_admin %}
<div id="ans_add">
Expand Down Expand Up @@ -275,7 +276,7 @@ <h2>연관질문</h2>
{{ related.qa_subject }}
</a>
</td>
<td class="td_date">{{ related.qa_datetime }}</td>
<td class="td_date">{{ related.qa_datetime|datetime_format('%y-%m-%d') }}</td>
<td class="td_stat">
{% if related.qa_status %}
<span class="txt_done">답변완료</span>
Expand Down

0 comments on commit 47fcd04

Please sign in to comment.