diff --git a/src/main/java/nlib/bbs/service/ArticleVO.java b/src/main/java/nlib/bbs/service/ArticleVO.java index 2f33d5d8..6e919161 100644 --- a/src/main/java/nlib/bbs/service/ArticleVO.java +++ b/src/main/java/nlib/bbs/service/ArticleVO.java @@ -172,6 +172,10 @@ public class ArticleVO extends PagingVO { public String getRegNm() { return regNm; } + public String getRegNmSec() { + if(StringUtil.isEmpty(regNm)) return null; + return StringUtil.maskName(regNm); + } public void setRegNm(String regNm) { this.regNm = regNm; } diff --git a/src/main/java/nlib/util/StringUtil.java b/src/main/java/nlib/util/StringUtil.java index 9b6668fc..be322d20 100644 --- a/src/main/java/nlib/util/StringUtil.java +++ b/src/main/java/nlib/util/StringUtil.java @@ -325,7 +325,9 @@ public class StringUtil extends StringUtils { return name; } - if (name.length() == 2) { + if (name.length() == 1) { + return "*"; + } else if (name.length() == 2) { return name.substring(0, 1) + "*"; } else if (name.length() > 2) { String str = ""; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp index 88e21426..fc6a0db0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp @@ -48,6 +48,7 @@ $("#btnSearch").on("click", function(e) { fn_searchArticle(1); }); + $("#searchKeyword").on("keydown", function(e) { if(e.keyCode == 13) { fn_searchArticle(1); @@ -127,16 +128,16 @@ } // 기존 데이터 CLEAR - $( ".list-notice thead").not('.t-tit-line').not('.no-result').remove(); + $(".list-notice tbody tr").filter('.tableTrData').remove(); if(!jsonObj.data || jsonObj.data.length <= 0 ) { - $(".list-notice li.no-result").show(); + $(".list-notice tbody tr.no-result").show(); } else { - $(".list-notice li.no-result").hide(); + $(".list-notice tbody tr.no-result").hide(); // 출력 $.each(jsonObj.data,function(key,obj) { - var li = $(document.createElement('tr')); + var li = $(''); li.append($('').attr('class', 't-num').html(obj.rno)); li.append($('').attr('class', 't-tit').html("" + (obj.notiYn == "Y" ? '공지' : '') + @@ -157,6 +158,13 @@ }); } +function fn_checkEnter() { + if (window.event.keyCode == 13) { + fn_searchArticle(1); + return false; + } + } + @@ -210,7 +218,7 @@
- + " + obj.title + (obj.secretYn == "Y" ? '자물쇠 아이콘 ' : '') + "")); - li.append($('').attr('class', 't-writer').html(obj.regNm)); + li.append($('').attr('class', 't-writer').html(obj.regNmSec)); li.append($('').attr('class', 't-date').html(obj.regDd)); li.append($('').attr('class', 't-answer').html((obj.answerYn == "Y" ? '답변완료' : '답변대기'))); @@ -201,17 +200,10 @@ //게시글 작성으로 이동 function fn_newArticle() { - - alert("로그인 후, 이용하여 주시기 바랍니다."); - return false; - - - $("#articleNo").val(""); $("#articleForm").attr("action", "${pageContext.request.contextPath}/bbs/insertQnaForm.do"); $('#articleForm').removeAttr('onsubmit'); $("#articleForm").submit(); - } @@ -297,7 +289,7 @@ - 검색결과가 없습니다. + 검색결과가 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp index 11ce94e3..1da28fa3 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp @@ -46,7 +46,13 @@ $( document ).ready(function() { //목록으로 이동 function fn_list() { - $("#articleForm").submit(); + if($("#searchQuestionType").val() == "USER") { + $("#articleForm").attr("action", "${pageContext.request.contextPath}/bbs/listMyQnas.do"); + } else { + $("#articleForm").attr("action", "${pageContext.request.contextPath}/bbs/listQnas.do"); + } + + $("#articleForm").submit(); } function fn_update() { @@ -187,6 +193,8 @@ function fn_downloadFile(attachFileId, fileSn) { + +