Skip to content

Commit 3eb0361

Browse files
author
Takahashi.Hiroyuki
committed
レビュー対応:キー名を改善
1 parent e642a1c commit 3eb0361

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

iplass-gem/src/main/java/org/iplass/mtp/impl/view/top/parts/MetaEntityListParts.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,16 +385,16 @@ public void setAttribute(HttpServletRequest req) {
385385
}
386386

387387
request.setAttribute("entityListParts", currentConfig());
388-
request.setAttribute("listPartsSearchFormView", form);
389-
request.setAttribute("title", title);
388+
request.setAttribute("MetaEntityListParts_searchFormView", form);
389+
request.setAttribute("MetaEntityListParts_title", title);
390390
}
391391

392392
@Override
393393
public void clearAttribute(HttpServletRequest req) {
394394
RequestContext request = WebUtil.getRequestContext();
395395
request.removeAttribute("entityListParts");
396-
request.removeAttribute("listPartsSearchFormView");
397-
request.removeAttribute("title");
396+
request.removeAttribute("MetaEntityListParts_searchFormView");
397+
request.removeAttribute("MetaEntityListParts_title");
398398
// partsCnt は削除NG(∵ 呼び出し元 TopViewHandler.loadParts() がHttpServletRequest 経由で参照するため)
399399
// TODO: とは言え、この対応は「その場しのぎ」に見える(∵ clearAttribute() の本来の責務は setAttribute() でセットした属性のクリーンアップのはず)
400400
// 使われる側が呼び出し元の実装に依存するのは、設計上好ましくない

iplass-gem/src/main/resources/META-INF/resources/jsp/gem/generic/search/list.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
EntityListParts parts = (EntityListParts) request.getAttribute("entityListParts");
6363
if (parts == null) return;
6464
65-
SearchFormView form = (SearchFormView) request.getAttribute("listPartsSearchFormView");
65+
SearchFormView form = (SearchFormView) request.getAttribute("MetaEntityListParts_searchFormView");
6666
6767
String topViewListOffsetInfo = request.getParameter(Constants.TOPVIEW_LIST_OFFSET);
6868
@@ -144,7 +144,7 @@
144144
<div class="<c:out value="<%=cellStyle %>"/>" id="topview-parts-id_${partsCnt}" style="display:none;">
145145
<h3 class="hgroup-02">
146146
${entityListParts.iconTag}
147-
${m:esc(title)}
147+
${m:esc(MetaEntityListParts_title)}
148148
</h3>
149149
<%
150150
String id = ((int)(Math.random() * 1000) + "_" + new Date().getTime());

iplass-gem/src/main/resources/META-INF/resources/jsp/gem/generic/search/listWidget.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
EntityListParts parts = (EntityListParts) request.getAttribute("entityListParts");
4242
if (parts == null) return;
4343
44-
SearchFormView form = (SearchFormView) request.getAttribute("listPartsSearchFormView");
44+
SearchFormView form = (SearchFormView) request.getAttribute("MetaEntityListParts_searchFormView");
4545
4646
String urlPath = ViewUtil.getParamMappingPath(parts.getDefName(), parts.getViewNameForLink());
4747
String searchViewAction = SearchViewCommand.SEARCH_ACTION_NAME + urlPath;
@@ -74,7 +74,7 @@
7474
data-limit="<%=limit%>" data-prevLabel="<c:out value="<%=prevLabel%>"/>" data-nextLabel="<c:out value="<%=nextLabel%>"/>">
7575
<div class="lyt-shortcut-01 mb05">
7676
${entityListParts.iconTag}
77-
<p class="title">${m:esc(title)}</p>
77+
<p class="title">${m:esc(MetaEntityListParts_title)}</p>
7878
<div class="widget-contents" style="<%=styleAttr%>">
7979
<ul class="list-entity-name" data-webapiName="<%=SearchNameListCommand.WEBAPI_NAME%>" data-viewAction="<c:out value="<%=viewAction%>" />">
8080
</ul>

0 commit comments

Comments
 (0)