Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
RAVE-714: changed references of entityId property to id in rave-porta…
Browse files Browse the repository at this point in the history 
…l-resources client code

git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1356286 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Anthony Carlucci committed Jul 2, 2012
1 parent a91c2cc commit d43a69e
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 204 deletions.
4 changes: 2 additions & 2 deletions rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
View file
Expand Up @@ -22,13 +22,13 @@
<ul class="nav nav-tabs outlined">
<!-- first render the tabs -->
<c:forEach var="subPage" items="${subPages}" varStatus="subPageStatus">
<li><a href="#tab-${subPage.entityId}" data-toggle="tab"><c:out value="${subPage.name}"/></a></li>
<li><a href="#tab-${subPage.id}" data-toggle="tab"><c:out value="${subPage.name}"/></a></li>
</c:forEach>
</ul>
<!-- now render the sub page bodies -->
<div class="tab-content outlined">
<c:forEach var="subPage" items="${subPages}" varStatus="subPageStatus">
<div class="tab-pane" id="tab-${subPage.entityId}">
<div class="tab-pane" id="tab-${subPage.id}">
<c:forEach var="subPageRegion" items="${subPage.regions}" varStatus="subPageRegionStatus">
<rave:region region="${subPageRegion}" regionIdx="${subPageRegionStatus.count}" />
</c:forEach>
Expand Down
2 changes: 1 addition & 1 deletion rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
View file
Expand Up @@ -49,7 +49,7 @@
</thead>
<tbody>
<c:forEach items="${categories}" var="category">
<spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
<spring:url value="/app/admin/category/edit?id=${category.id}" var="detaillink"/>

<tr data-detaillink="${detaillink}">
<td>
Expand Down
2 changes: 1 addition & 1 deletion rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
View file
Expand Up @@ -54,7 +54,7 @@
</thead>
<tbody>
<c:forEach var="user" items="${searchResult.resultSet}">
<spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
<spring:url value="/app/admin/userdetail/${user.id}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
<td><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
<td><c:out value="${user.email}"/></td>
Expand Down
2 changes: 1 addition & 1 deletion rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
View file
Expand Up @@ -50,7 +50,7 @@
</thead>
<tbody>
<c:forEach var="widget" items="${searchResult.resultSet}">
<spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
<spring:url value="/app/admin/widgetdetail/${widget.id}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
<td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
<td><fmt:message key="widget.type.${widget.type}"/></td>
Expand Down
30 changes: 15 additions & 15 deletions rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
View file
Expand Up @@ -34,7 +34,7 @@
</fmt:message>
<rave:navbar pageTitle="${pagetitle}"/>

<input id="currentPageId" type="hidden" value="${page.entityId}" />
<input id="currentPageId" type="hidden" value="${page.id}" />
<c:set var="hasOnlyOnePage" scope="request">
<c:choose>
<c:when test="${fn:length(pages) == 1}">true</c:when>
Expand All @@ -48,12 +48,12 @@
<%-- determine if the current page in the list matches the page the user is viewing --%>
<c:set var="isCurrentPage">
<c:choose>
<c:when test="${page.entityId == userPage.entityId}">true</c:when>
<c:when test="${page.id == userPage.id}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
<div id="tab-${userPage.entityId}" class="rave-ui-tab rave-ui-tab-mobile<c:if test="${isCurrentPage}"> rave-ui-tab-selected rave-ui-tab-selected-mobile</c:if>">
<div id="pageTitle-${userPage.entityId}" class="page-title" onclick="rave.viewPage(${userPage.entityId});"><c:out value="${userPage.name}"/></div>
<div id="tab-${userPage.id}" class="rave-ui-tab rave-ui-tab-mobile<c:if test="${isCurrentPage}"> rave-ui-tab-selected rave-ui-tab-selected-mobile</c:if>">
<div id="pageTitle-${userPage.id}" class="page-title" onclick="rave.viewPage(${userPage.id});"><c:out value="${userPage.name}"/></div>
</div>
</c:forEach>
<%-- display the add page button at the end of the tabs --%>
Expand All @@ -64,17 +64,17 @@
<%-- the mobile view will only show one column of widgets --%>
<div id="pageContent" class="pageContent-mobile">
<c:forEach var="region" items="${page.regions}">
<div class="region-mobile" id="region-${region.entityId}-id">
<div class="region-mobile" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
<div class="widget-wrapper widget-wrapper-mobile" id="widget-${regionWidget.entityId}-wrapper">
<div class="widget-title-bar widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.entityId});">
<span id="widget-${regionWidget.entityId}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></span>
<div id="widget-${regionWidget.entityId}-title" class="widget-title">
<div class="widget-wrapper widget-wrapper-mobile" id="widget-${regionWidget.id}-wrapper">
<div class="widget-title-bar widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.id});">
<span id="widget-${regionWidget.id}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></span>
<div id="widget-${regionWidget.id}-title" class="widget-title">
<c:out value="${regionWidget.widget.title}"/>
</div>
</div>
<div class="widget-prefs" id="widget-${regionWidget.entityId}-prefs-content"></div>
<div class="widget widget-mobile" id="widget-${regionWidget.entityId}-body">
<div class="widget-prefs" id="widget-${regionWidget.id}-prefs-content"></div>
<div class="widget widget-mobile" id="widget-${regionWidget.id}-body">
<portal:render-widget regionWidget="${regionWidget}" />
</div>
</div>
Expand Down Expand Up @@ -112,8 +112,8 @@
<option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
</c:if>
<c:forEach var="userPage" items="${pages}">
<c:if test="${userPage.entityId != page.entityId}">
<option value="${userPage.entityId}">
<c:if test="${userPage.id != page.id}">
<option value="${userPage.id}">
<fmt:message key="page.general.movethispage.after">
<fmt:param><c:out value="${userPage.name}"/></fmt:param>
</fmt:message>
Expand All @@ -129,8 +129,8 @@
<form id="moveWidgetForm">
<select id="moveToPageId">
<c:forEach var="userPage" items="${pages}">
<c:if test="${userPage.entityId != page.entityId}">
<option value="${userPage.entityId}">
<c:if test="${userPage.id != page.id}">
<option value="${userPage.id}">
<c:out value="${userPage.name}"/>
</option>
</c:if>
Expand Down
22 changes: 11 additions & 11 deletions rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
View file
Expand Up @@ -37,7 +37,7 @@
</fmt:message>
<rave:navbar pageTitle="${pagetitle}"/>

<input id="currentPageId" type="hidden" value="${page.entityId}"/>
<input id="currentPageId" type="hidden" value="${page.id}"/>
<c:set var="hasOnlyOnePage" scope="request">
<c:choose>
<c:when test="${fn:length(pages) == 1}">true</c:when>
Expand All @@ -53,7 +53,7 @@
<%-- determine if the current page in the list matches the page the user is viewing --%>
<c:set var="isCurrentPage">
<c:choose>
<c:when test="${page.entityId == userPage.entityId}">true</c:when>
<c:when test="${page.id == userPage.id}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
Expand All @@ -75,7 +75,7 @@
<fmt:message key="sharing.page.tab.icon.tip.to" var="iconShareToolTipTo"/>
<c:choose>
<c:when test="${isCurrentPage}">
<li id="tab-${userPage.entityId}" class="active dropdown" >
<li id="tab-${userPage.id}" class="active dropdown" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<c:if test="${isSharedToMe}">
<b id="pageMenuSharedIcon" class="ui-icon ui-icon-person" title="<c:out value="${iconShareToolTipFrom}"/>"></b>
Expand All @@ -96,7 +96,7 @@
</li>
</c:when>
<c:otherwise>
<li id="tab-${userPage.entityId}" onclick="rave.viewPage(${userPage.entityId});">
<li id="tab-${userPage.id}" onclick="rave.viewPage(${userPage.id});">
<c:choose>
<c:when test="${isSharedToMe}">
<a href="#" class="rave-ui-tab-shared-to-me">
Expand All @@ -118,7 +118,7 @@
</c:otherwise>
</c:choose>
<c:forEach var="members" items="${userPage.members}">
<c:if test="${members.user.username == principleUsername and members.editor and userPage.entityId != page.entityId}">
<c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
<c:set var="canMoveWidgetsToEditablePage" scope="request" value="true"/>
</c:if>
</c:forEach>
Expand All @@ -133,7 +133,7 @@
<div class="emptyPageMessage">
<c:choose>
<c:when test="${pageUser.editor == true}">
<a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />"><fmt:message key="page.general.empty"/></a>
<a href="<spring:url value="/app/store?referringPageId=${page.id}" />"><fmt:message key="page.general.empty"/></a>
</c:when>
<c:otherwise>
<fmt:message key="page.general.non.editing.empty"/>
Expand Down Expand Up @@ -202,8 +202,8 @@
<option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
</c:if>
<c:forEach var="userPage" items="${pages}">
<c:if test="${userPage.entityId != page.entityId}">
<option value="${userPage.entityId}">
<c:if test="${userPage.id != page.id}">
<option value="${userPage.id}">
<fmt:message key="page.general.movethispage.after">
<fmt:param><c:out value="${userPage.name}"/></fmt:param>
</fmt:message>
Expand Down Expand Up @@ -236,8 +236,8 @@
<select id="moveToPageId">
<c:forEach var="userPage" items="${pages}">
<c:forEach var="members" items="${userPage.members}">
<c:if test="${members.user.username == principleUsername and members.editor and userPage.entityId != page.entityId}">
<option value="${userPage.entityId}">
<c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
<option value="${userPage.id}">
<c:out value="${userPage.name}"/>
</option>
</c:if>
Expand Down Expand Up @@ -304,7 +304,7 @@
rave.initWidgets();
rave.initUI();
rave.layout.init();
rave.layout.searchHandler.setDefaults("<c:out value="${principleUsername}"/>","<sec:authentication property="principal.entityId" />","<c:out value="${page.entityId}"/>", "${pageUser.pageStatus}");
rave.layout.searchHandler.setDefaults("<c:out value="${principleUsername}"/>","<sec:authentication property="principal.id" />","<c:out value="${page.id}"/>", "${pageUser.pageStatus}");
rave.runOnPageInitializedHandlers();
});
</script>
Expand Down

0 comments on commit d43a69e

Please sign in to comment.