svnno****@sourc*****
svnno****@sourc*****
2008年 10月 21日 (火) 16:33:57 JST
Revision: 1229
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1229
Author: shinsuke
Date: 2008-10-21 16:33:56 +0900 (Tue, 21 Oct 2008)
Log Message:
-----------
fixed time condition, fixed a sort order and changed a page size.
Modified Paths:
--------------
board/trunk/src/main/java/jp/sf/pal/board/pager/MessagePager.java
board/trunk/src/main/java/jp/sf/pal/board/service/MessageService.java
-------------- next part --------------
Modified: board/trunk/src/main/java/jp/sf/pal/board/pager/MessagePager.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/pager/MessagePager.java 2008-10-21 07:13:31 UTC (rev 1228)
+++ board/trunk/src/main/java/jp/sf/pal/board/pager/MessagePager.java 2008-10-21 07:33:56 UTC (rev 1229)
@@ -19,7 +19,7 @@
}
protected int getDefaultPageSize() {
- return 10;
+ return 20;
}
public Integer getCategoryId() {
Modified: board/trunk/src/main/java/jp/sf/pal/board/service/MessageService.java
===================================================================
--- board/trunk/src/main/java/jp/sf/pal/board/service/MessageService.java 2008-10-21 07:13:31 UTC (rev 1228)
+++ board/trunk/src/main/java/jp/sf/pal/board/service/MessageService.java 2008-10-21 07:33:56 UTC (rev 1229)
@@ -72,22 +72,17 @@
cb.query().setCreatedBy_Equal(messagePager.getCreatedBy());
}
} else {
- // public
- Date now = new Date();
- int year = DateUtil.getYear(now);
- int month = DateUtil.getMonth(now);
- int date = DateUtil.getDate(now);
- cb.query()
- .setStartTime_LessEqual(
- new Timestamp(DateUtil.get(year, month, date)
- .getTime()));
- cb.query().setEndTime_GreaterThan(
- new Timestamp(DateUtil.get(year, month, date + 1)
- .getTime()));
+ if (messagePager.getCreatedBy() != null) { // not admin
+ // public
+ cb.query().setStartTime_LessEqual(
+ new Timestamp(new Date().getTime()));
+ cb.query().setEndTime_GreaterThan(
+ new Timestamp(new Date().getTime()));
+ }
}
}
- cb.query().addOrderBy_UpdatedBy_Desc();
+ cb.query().addOrderBy_UpdatedTime_Desc();
PagingResultBean<Message> messageList = messageBhv.selectPage(cb);