From 0e11ef76d717e453406c07cdec7806cb6f67aa55 Mon Sep 17 00:00:00 2001 From: koda Date: Tue, 16 Jun 2015 03:01:41 +0900 Subject: [PATCH] =?UTF-8?q?=20=E7=B7=A8=E9=9B=86=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E3=81=A7=E2=80=9D?= =?UTF-8?q?=E3=81=8C=EF=BC=86quot;=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=20#52=20=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=AB=E4=BD=95=E3=82=82=E5=85=A5=E5=8A=9B=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=A7=E7=99=BB=E9=8C=B2=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=20#53=20=20=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE?= =?UTF-8?q?=E9=A0=86=E7=95=AA=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=8F?= =?UTF-8?q?=E3=81=AA=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B?= =?UTF-8?q?=20#54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge/control/protect/KnowledgeControl.java | 10 +++++----- .../org/support/project/knowledge/dao/CommentsDao.java | 1 + src/main/resources/appresource.properties | 2 +- src/main/resources/appresource_ja.properties | 8 ++++---- src/main/webapp/WEB-INF/views/open/knowledge/view.jsp | 4 +++- .../WEB-INF/views/protect/knowledge/view_add.jsp | 2 ++ .../WEB-INF/views/protect/knowledge/view_edit.jsp | 3 ++- src/main/webapp/js/knowledge-edit.js | 4 +++- src/main/webapp/js/knowledge-view.js | 6 ++++-- 9 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java index b83c182e6..39b14b61a 100644 --- a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java +++ b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java @@ -98,7 +98,7 @@ public Boundary view_edit() throws InvalidParamException { setAttribute("edit", false); addMsgWarn("knowledge.edit.noaccess"); //return forward("/open/knowledge/view.jsp"); - return devolution(HttpMethod.get, "open.knowledge/view", String.valueOf(knowledgeId)); + return devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(knowledgeId)); } return forward("view_edit.jsp"); @@ -248,7 +248,7 @@ public Boundary update(KnowledgesEntity entity) throws Exception { setAttribute("edit", false); addMsgWarn("knowledge.edit.noaccess"); //return forward("/open/knowledge/view.jsp"); - return devolution(HttpMethod.get, "open.knowledge/view", String.valueOf(entity.getKnowledgeId())); + return devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(entity.getKnowledgeId())); } LOG.trace("save"); @@ -295,7 +295,7 @@ public Boundary delete() throws Exception { setAttribute("edit", false); addMsgWarn("knowledge.edit.noaccess"); //return forward("/open/knowledge/view.jsp"); - return devolution(HttpMethod.get, "open.knowledge/view", String.valueOf(knowledgeId)); + return devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(knowledgeId)); } LOG.trace("save"); knowledgeLogic.delete(knowledgeId, getLoginedUser()); @@ -328,12 +328,12 @@ public Boundary comment() throws Exception { // 共通処理呼の表示条件の保持の呼び出し String params = setViewParam(); Long knowledgeId = super.getPathLong(Long.valueOf(-1)); - String comment = super.doSamy(getParam("comment")); + String comment = super.doSamy(getParam("addcomment")); // 必須チェック if (StringUtils.isEmpty(comment)) { addMsgWarn("errors.required", "Comment"); - return super.devolution(HttpMethod.get, "/open.knowledge/view/" + knowledgeId + params); + return super.devolution(HttpMethod.get, "open.Knowledge/view", String.valueOf(knowledgeId)); } KnowledgeLogic.get().saveComment(knowledgeId, comment); return super.redirect(getRequest().getContextPath() + "/open.knowledge/view/" + knowledgeId + params); diff --git a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java index f8bf868df..a2fe3d22e 100644 --- a/src/main/java/org/support/project/knowledge/dao/CommentsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/CommentsDao.java @@ -30,6 +30,7 @@ public List selectOnKnowledgeId(Long knowledgeId) { builder.append("SELECT *, USERS.USER_NAME AS UPDATE_USER_NAME FROM COMMENTS "); builder.append("LEFT OUTER JOIN USERS ON USERS.USER_ID = COMMENTS.UPDATE_USER "); builder.append("WHERE KNOWLEDGE_ID = ? "); + builder.append("ORDER BY COMMENTS.INSERT_DATETIME "); return executeQueryList(builder.toString(), CommentsEntity.class, knowledgeId); } diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties index 28532722a..45efd2d02 100644 --- a/src/main/resources/appresource.properties +++ b/src/main/resources/appresource.properties @@ -53,7 +53,7 @@ message.allready.updated=Allready updated. message.allready.started=Allready started. # Common Label -label.version=0.5.2 pre3 +label.version=0.5.2 pre4 label.login=Sign in label.previous = Previous label.next=Next diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties index 162ffc306..ff082a3cb 100644 --- a/src/main/resources/appresource_ja.properties +++ b/src/main/resources/appresource_ja.properties @@ -53,7 +53,7 @@ message.allready.updated=すでに更新されています message.allready.started=すでに開始済です # Common Label -label.version=0.5.2 pre3 +label.version=0.5.2 pre4 label.login=サインイン label.previous = 前へ label.next = 次へ @@ -112,8 +112,8 @@ knowledge.navbar.search.placeholder=キーワードで検索 knowledge.navbar.account.myaccount=自分のアカウント情報 knowledge.navbar.account.myknowledge=自分で登録したナレッジ knowledge.navbar.account.notify=通知設定 -knowledge.navbar.signin=サインインします -knowledge.navbar.signout=サインアウトします +knowledge.navbar.signin=サインイン +knowledge.navbar.signout=サインアウト knowledge.navbar.lang=表示言語 knowledge.navbar.lang.en=English knowledge.navbar.lang.ja=Japanese @@ -130,7 +130,7 @@ knowledge.navbar.data.export=エクスポート knowledge.auth.description=サインインが必要な機能です。
(ナレッジの編集などはサインインが必要です) knowledge.auth.signin=サインイン実行 -knowledge.auth.signup=ユーザ未登録の人は「ユーザ新規登録」できます +knowledge.auth.signup=アカウント新規登録 knowledge.auth.forgot.password=パスワードを忘れましたか？ knowledge.auth.label.mail=メールアドレス knowledge.auth.label.id=ID diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp index 9416b790d..1fcf1ae54 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp @@ -193,7 +193,7 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>'; <% if (request.getRemoteUser() != null) { %>
<%= jspUtil.out("params") %>" method="post" role="form"> - + <% if (jspUtil.out("insertUser").equals(request.getRemoteUser())) { %> @@ -218,6 +218,8 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>';

+