Merge pull request #120 from support-project/implementation/issue115

グループ一覧でグループの記事数を表示するように
support-project · Oct 23, 2015 · 960701a · 960701a
2 parents 9fdf445 + ae6fafd
commit 960701a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/webapp/WEB-INF/views/protect/group/groups.jsp b/src/main/webapp/WEB-INF/views/protect/group/groups.jsp
@@ -68,8 +68,17 @@
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_ADMIN, "group.status", jspUtil.label("knowledge.group.mylist.label.admin")) %>
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_MEMBER, "group.status", jspUtil.label("knowledge.group.mylist.label.member")) %>
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_WAIT, "group.status", jspUtil.label("knowledge.group.mylist.label.wait")) %>
-		<br/>
+		<span class="badge pull-right"><%= jspUtil.out("group.groupKnowledgeCount") %></span>
+		</p>
+		<p>
+		<c:choose>
+		<c:when test="${ '' != group.description }">
 		<%= jspUtil.out("group.description") %>
+		</c:when>
+		<c:otherwise>
+		&nbsp;
+		</c:otherwise>
+		</c:choose>
 		</p>
 	</a>
 </c:forEach>

diff --git a/src/main/webapp/WEB-INF/views/protect/group/mygroups.jsp b/src/main/webapp/WEB-INF/views/protect/group/mygroups.jsp
@@ -61,8 +61,17 @@
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_ADMIN, "group.status", jspUtil.label("knowledge.group.mylist.label.admin")) %>
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_MEMBER, "group.status", jspUtil.label("knowledge.group.mylist.label.member")) %>
 		<%= jspUtil.is(CommonWebParameter.GROUP_ROLE_WAIT, "group.status", jspUtil.label("knowledge.group.mylist.label.wait")) %>
-		<br/>
+		<span class="badge pull-right"><%= jspUtil.out("group.groupKnowledgeCount") %></span>
+		</p>
+		<p>
+		<c:choose>
+		<c:when test="${ '' != group.description }">
 		<%= jspUtil.out("group.description") %>
+		</c:when>
+		<c:otherwise>
+		&nbsp;
+		</c:otherwise>
+		</c:choose>
 		</p>
 	</a>
 </c:forEach>