From 96f99f3bb59bce17e7c07653540282e12973d396 Mon Sep 17 00:00:00 2001 From: koda Date: Thu, 11 Jun 2015 16:34:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8A=E3=83=AC=E3=83=83=E3=82=B8=E3=81=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=80=85=E6=83=85=E5=A0=B1=E3=81=8C=E3=81=8A?= =?UTF-8?q?=E3=81=8B=E3=81=97=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge/logic/KnowledgeLogic.java | 4 +- .../views/commons/layout/layoutMain.jsp | 1 - .../views/commons/layout/layoutTop.jsp | 2 - .../WEB-INF/views/open/knowledge/list.jsp | 4 +- .../WEB-INF/views/open/knowledge/view.jsp | 58 +++++++++++++------ src/main/webapp/css/knowledge-view.css | 8 +++ 6 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java index 4b0f3f4cc..17446fd25 100644 --- a/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java +++ b/src/main/java/org/support/project/knowledge/logic/KnowledgeLogic.java @@ -188,7 +188,7 @@ public KnowledgesEntity update(KnowledgesEntity entity, List tags, L fileLogic.setKnowledgeFiles(entity, fileNos, loginedUser); // 全文検索エンジンへ登録 - saveIndex(entity, tags, targets, loginedUser.getUserId()); + saveIndex(entity, tags, targets, entity.getInsertUser()); // 一覧表示用の情報を更新 updateKnowledgeExInfo(entity); @@ -920,7 +920,7 @@ public void updateKnowledgeExInfo(KnowledgesEntity entity) { // 更新 KnowledgesDao knowledgesDao = KnowledgesDao.get(); - knowledgesDao.update(entity); + knowledgesDao.update(entity.getUpdateUser(), entity); } diff --git a/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp b/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp index 1057eadbf..777fcf838 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp @@ -77,7 +77,6 @@ ${param.PARAM_CONTENT} ${param.PARAM_SCRIPTS} - diff --git a/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp b/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp index c8fb6cc6f..f57733391 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp @@ -66,8 +66,6 @@ ${param.PARAM_CONTENT} ${param.PARAM_SCRIPTS} - - diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp index 44f3e8208..9454ed42f 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp @@ -99,7 +99,7 @@

" + data-echo="<%= request.getContextPath()%>/open.account/icon/<%= jspUtil.out("knowledge.insertUser") %>" alt="icon" width="36" height="36" style="float:left"/>  <%= jspUtil.date("knowledge.updateDatetime")%>
@@ -114,7 +114,7 @@ <%= jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT), "knowledge.publicFlag", jspUtil.label("label.protect.view")) %>
-  <%= jspUtil.out("knowledge.updateUserName") %> +  <%= jspUtil.out("knowledge.insertUserName") %>

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 f43c81341..9416b790d 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp @@ -55,7 +55,21 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>';   <%= jspUtil.label("knowledge.view.like") %> - +

+ +

+ <%= jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PUBLIC), "publicFlag", + jspUtil.label("label.public.view")) %> + <%= jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PRIVATE), "publicFlag", + jspUtil.label("label.private.view")) %> + + <% if(jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT), "publicFlag")) { %> + + + <% } %> + <%= jspUtil.out("params") %>" >   × <%= jspUtil.out("like_count") %> @@ -67,34 +81,40 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>';

+

+

+ [<%= jspUtil.label("label.registration") %>] +
" + data-echo="<%= request.getContextPath()%>/open.account/icon/<%= jspUtil.out("insertUser") %>" alt="icon" width="36" height="36" style="float:left" /> - - "> -  <%= jspUtil.date("updateDatetime")%> + "> +  <%= jspUtil.out("insertUserName", JspUtil.ESCAPE_CLEAR) %> -     - - <%= jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PUBLIC), "publicFlag", - jspUtil.label("label.public.view")) %> - <%= jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PRIVATE), "publicFlag", - jspUtil.label("label.private.view")) %> - - <% if(jspUtil.is(String.valueOf(KnowledgeLogic.PUBLIC_FLAG_PROTECT), "publicFlag")) { %> - - - <% } %>
- + "> +  <%= jspUtil.date("insertDatetime")%> + +

+ +

+

+ [<%= jspUtil.label("label.update") %>] +
+ " + alt="icon" width="36" height="36" style="float:left" /> ">  <%= jspUtil.out("updateUserName", JspUtil.ESCAPE_CLEAR) %> +
+ "> +  <%= jspUtil.date("updateDatetime")%> +

+

" /> diff --git a/src/main/webapp/css/knowledge-view.css b/src/main/webapp/css/knowledge-view.css index 26f0ba8e6..09f392f7a 100644 --- a/src/main/webapp/css/knowledge-view.css +++ b/src/main/webapp/css/knowledge-view.css @@ -17,6 +17,14 @@ box-shadow: none; } +.saveType { + float: left; + height: 36px; + line-height: 36px; + margin: 0 auto; + vertical-align: middle; +} +