DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop

Browse Source
This commit is contained in:
U-XeNote\Martin 2011-07-29 12:34:33 +02:00
commit ac8716d4b0
2 changed files with 3 additions and 5 deletions
src/main
java/se/su/dsv/scipro/conference/panels
ConferencePanel.java
webapp/WEB-INF
web.xml

4
src/main/java/se/su/dsv/scipro/conference/panels/ConferencePanel.java

@ -92,10 +92,8 @@ public class ConferencePanel extends Panel {
webMarkupContainer.setOutputMarkupId(true); webMarkupContainer.setOutputMarkupId(true);
webMarkupContainer.add(new PagingNavigator("pagingNavigator", dataView)); webMarkupContainer.add(new PagingNavigator("pagingNavigator", dataView));
add(webMarkupContainer); add(webMarkupContainer);
if (boardMessageModel != null) { if (boardMessageModel != null) {
int index = boardMessageDao.getBoardMessageSortOrderIndex(boardMessageModel.getObject()); int index = boardMessageDao.getBoardMessageSortOrderIndex(boardMessageModel.getObject());
System.out.println(index);
dataView.setCurrentPage(index/BOARDMESSAGESPERPAGE); dataView.setCurrentPage(index/BOARDMESSAGESPERPAGE);
} }
} }

4
src/main/webapp/WEB-INF/web.xml

@ -64,8 +64,8 @@
<!-- Use deployment for production, development for development --> <!-- Use deployment for production, development for development -->
<context-param> <context-param>
<param-name>configuration</param-name> <param-name>configuration</param-name>
<param-value>development</param-value> <!--<param-value>development</param-value> -->
<!-- <param-value>deployment</param-value>--> <param-value>deployment</param-value>
</context-param> </context-param>