Skip to content

Commit 8e3181a

Browse files
committed
Removed next/previous buttons on full record page. Removed navigation state code
1 parent de25809 commit 8e3181a

File tree

5 files changed

+0
-290
lines changed

5 files changed

+0
-290
lines changed

access/src/main/java/edu/unc/lib/dl/ui/controller/FullRecordController.java

-13
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import edu.unc.lib.dl.search.solr.util.SearchFieldKeys;
5959
import edu.unc.lib.dl.ui.exception.InvalidRecordRequestException;
6060
import edu.unc.lib.dl.ui.exception.RenderViewException;
61-
import edu.unc.lib.dl.ui.model.RecordNavigationState;
6261
import edu.unc.lib.dl.ui.util.AccessUtil;
6362
import edu.unc.lib.dl.ui.view.XSLViewResolver;
6463
import edu.unc.lib.dl.util.ContentModelHelper;
@@ -214,18 +213,6 @@ public String getFullRecord(String pid, Model model, HttpServletRequest request)
214213
applyContainerSettings(pid, foxmlView, model, fullObjectView != null);
215214
}
216215

217-
// Store search state information to the users session to enable page to page navigation
218-
RecordNavigationState recordNavigationState = (RecordNavigationState) request.getSession().getAttribute(
219-
"recordNavigationState");
220-
if (recordNavigationState != null) {
221-
int index = recordNavigationState.indexOf(pid);
222-
if (index > -1) {
223-
recordNavigationState.setCurrentRecordId(pid);
224-
recordNavigationState.setCurrentRecordIndex(index);
225-
request.getSession().setAttribute("recordNavigationState", recordNavigationState);
226-
}
227-
}
228-
229216
model.addAttribute("listAccess", listAccess);
230217

231218
model.addAttribute("pageSubtitle", briefObject.getTitle());

access/src/main/java/edu/unc/lib/dl/ui/controller/FullRecordNavigationController.java

-105
This file was deleted.

access/src/main/java/edu/unc/lib/dl/ui/controller/SearchActionController.java

-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import edu.unc.lib.dl.search.solr.model.SearchState;
3535
import edu.unc.lib.dl.search.solr.util.SearchFieldKeys;
3636
import edu.unc.lib.dl.search.solr.util.SearchStateUtil;
37-
import edu.unc.lib.dl.ui.model.RecordNavigationState;
3837
import edu.unc.lib.dl.util.ResourceType;
3938

4039
/**
@@ -71,13 +70,6 @@ public String search(Model model, HttpServletRequest request) {
7170

7271
private String search(SearchRequest searchRequest, Model model, HttpServletRequest request) {
7372
SearchResultResponse resultResponse = doSearch(searchRequest, model, request);
74-
// Setup parameters for full record navigation
75-
RecordNavigationState recordNavigationState = new RecordNavigationState();
76-
recordNavigationState.setSearchState(resultResponse.getSearchState());
77-
recordNavigationState.setSearchStateUrl((String) request.getAttribute("searchStateUrl"));
78-
recordNavigationState.setRecordIdList(resultResponse.getIdList());
79-
recordNavigationState.setTotalResults(resultResponse.getResultCount());
80-
request.getSession().setAttribute("recordNavigationState", recordNavigationState);
8173

8274
model.addAttribute("resultType", "searchResults");
8375
model.addAttribute("pageSubtitle", "Search Results");

access/src/main/java/edu/unc/lib/dl/ui/model/RecordNavigationState.java

-131
This file was deleted.

access/src/main/webapp/WEB-INF/jsp/fullRecord/navigationBar.jsp

-33
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,6 @@
2929
<c:param name="queryPath">list</c:param>
3030
</c:import>
3131
</div>
32-
<c:set var="recordNavigationState" value="${sessionScope.recordNavigationState}" />
33-
34-
<p class="right">
35-
<c:catch var="previousException">
36-
<c:set var="previousId" value="${recordNavigationState.previousRecordId}"/>
37-
</c:catch>
38-
<c:choose>
39-
<c:when test="${previousException!=null}">
40-
<a href="recordNavigation?${searchSettings.searchStateParams['ACTIONS']}=${searchSettings.actions['PREVIOUS_PAGE']}&${searchSettings.searchStateParams['ID']}=${briefObject.id}">&lt; Previous</a>
41-
</c:when>
42-
<c:when test="${empty previousId}">
43-
&lt; Previous
44-
</c:when>
45-
<c:otherwise>
46-
<a href="record/${previousId}">&lt; Previous</a>
47-
</c:otherwise>
48-
</c:choose>
49-
&nbsp;
50-
<c:catch var="nextException">
51-
<c:set var="nextId" value="${recordNavigationState.nextRecordId}"/>
52-
</c:catch>
53-
<c:choose>
54-
<c:when test="${nextException!=null}">
55-
<a href="recordNavigation?${searchSettings.searchStateParams['ACTIONS']}=${searchSettings.actions['NEXT_PAGE']}&${searchSettings.searchStateParams['ID']}=${briefObject.id}">Next &gt;</a>
56-
</c:when>
57-
<c:when test="${empty nextId}">
58-
Next &gt;
59-
</c:when>
60-
<c:otherwise>
61-
<a href="record/${nextId}">Next &gt;</a>
62-
</c:otherwise>
63-
</c:choose>
64-
</p>
6532
</div>
6633
</div>
6734
</div>

0 commit comments

Comments
 (0)