編集時のプレビューで”が＆quot;で表示される #52

 コメントに何も入力しないで登録するとエラーになる #53
 コメントの順番がおかしくなることがある #54

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);

src/main/java/org/support/project/knowledge/dao/CommentsDao.java

@@ -30,6 +30,7 @@ public List<CommentsEntity> 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);
 	}
 

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

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=サインインが必要な機能です。<br/>(ナレッジの編集などはサインインが必要です)
 knowledge.auth.signin=サインイン実行
-knowledge.auth.signup=ユーザ未登録の人は「ユーザ新規登録」できます
+knowledge.auth.signup=アカウント新規登録
 knowledge.auth.forgot.password=パスワードを忘れましたか？
 knowledge.auth.label.mail=メールアドレス
 knowledge.auth.label.id=ID

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) { %>
 		<form action="<%= request.getContextPath()%>/protect.knowledge/comment/<%= jspUtil.out("knowledgeId") %><%= jspUtil.out("params") %>" method="post" role="form">
-		<textarea class="form-control" name="comment" rows="1" placeholder="Comment" id="comment"></textarea>
+		<textarea class="form-control" name="addcomment" rows="1" placeholder="Comment" id="comment"><%= jspUtil.out("addcomment") %></textarea>
 
 	<% if (jspUtil.out("insertUser").equals(request.getRemoteUser())) { %>
 		<button type="button" class="btn btn-info" onclick="previewans();"><i class="fa fa-play-circle"></i>&nbsp;<%= jspUtil.label("label.preview") %></button>
@@ -218,6 +218,8 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>';
 
 
 <p class="preview markdown" id="preview"></p>
+<span style="display: none;" id="comment_text">
+</span>
 
 
 <span style="display: none;" id="content_text">

src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp

@@ -166,6 +166,8 @@ selectedEditors.push({label: '<%= jspUtil.out("editor.label") %>', value: '<%= j
 
 
 <p class="preview markdown" id="preview"></p>
+<span style="display: none;" id="content_text">
+</span>
 
 
 <%-- Editors --%>

src/main/webapp/WEB-INF/views/protect/knowledge/view_edit.jsp

@@ -174,7 +174,8 @@ selectedEditors.push({label: '<%= jspUtil.out("editor.label") %>', value: '<%= j
 </form>
 
 <p class="preview markdown" id="preview"></p>
-
+<span style="display: none;" id="content_text">
+</span>
 
 <%-- Editors --%>
 <div class="modal fade" id="editorSelectModal" tabindex="-1" role="dialog" aria-labelledby="editorModalLabel" aria-hidden="true">

src/main/webapp/js/knowledge-edit.js

@@ -298,6 +298,8 @@ var preview = function() {
 		title : $('#input_title').val(),
 		content : $('#content').val()
 	}, function(data) {
+		$('#content_text').html(data.content);
+
 		var html = '<div class="row">';
 		html += '<div class="col-sm-12">';
 		html += '<div class="thumbnail">';
@@ -306,7 +308,7 @@ var preview = function() {
 		html += data.title;
 		html += '</h3>';
 		html += '<p style="word-break:break-all" id="content">';
-		var content = marked(data.content);
+		var content = marked($('#content_text').html());
 		html += content;
 		html += '</p>';
 		html += '</div>';

src/main/webapp/js/knowledge-view.js

@@ -103,6 +103,7 @@ var preview = function() {
 		title : '',
 		content : $('#comment').val()
 	}, function(data) {
+		$('#comment_text').html(data.content);
 		var html = '<div class="question_Box">';
 		html += '<div class="question_image">';
 		html += '<img src="' + _CONTEXT + '/open.account/icon/' + $('#loginuser').val() + '" ';
@@ -113,7 +114,7 @@ var preview = function() {
 		html += '<div class="arrow_question">';
 
 		html += '<p style="word-break:break-all" id="content">';
-		content = marked(data.content);
+		var content = marked($('#comment_text').html());
 		html += content;
 
 		html += '</div><!-- /.arrow_question -->';
@@ -135,6 +136,7 @@ var previewans = function() {
 		title : '',
 		content : $('#comment').val()
 	}, function(data) {
+		$('#comment_text').html(data.content);
 		var html = '<div class="question_Box">';
 		html += '<div class="answer_image">';
 		html += '<img src="' + _CONTEXT + '/open.account/icon/' + $('#loginuser').val() + '" ';
@@ -143,7 +145,7 @@ var previewans = function() {
 		html += '<div class="arrow_answer">';
 
 		html += '<p style="word-break:break-all" id="content">';
-		content = marked(data.content);
+		var content = marked($('#comment_text').html());
 		html += content;
 
 		html += '</div>';