svnno****@sourc*****
svnno****@sourc*****
2008年 10月 27日 (月) 11:47:45 JST
Revision: 1245
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1245
Author: shinsuke
Date: 2008-10-27 11:47:44 +0900 (Mon, 27 Oct 2008)
Log Message:
-----------
could not display edit page on admin, and fixed potential bugs.
Modified Paths:
--------------
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/CategoryPager.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/util/DateUtil.java
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp
-------------- next part --------------
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -20,4 +20,6 @@
public static final Integer DEFAULT_CATEGORY_ID = Integer.valueOf(1);
+ public static final int SHARED_CATEGORY_ID = 2;
+
}
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -49,8 +49,6 @@
private transient HttpServletRequest request;
protected String displayList() {
- String username = request.getRemoteUser();
-
// page navi
linkPager.setCreatedBy(null);
linkPager.setCategoryId(null);
@@ -120,7 +118,7 @@
return "edit.jsp";
}
- @Execute(validator = false, input = "error.jsp")
+ @Execute(validator = false, input = "error.jsp", urlPattern = "editpage/{mode}/{id}")
public String editpage() {
linkForm.mode = BookmarkConstants.EDIT_MODE;
@@ -138,7 +136,7 @@
return "confirm.jsp";
}
- @Execute(validator = false, input = "error.jsp")
+ @Execute(validator = false, input = "error.jsp", urlPattern = "deletepage/{mode}/{id}")
public String deletepage() {
linkForm.mode = BookmarkConstants.DELETE_MODE;
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/CategoryPager.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/CategoryPager.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/CategoryPager.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -1,6 +1,9 @@
package jp.sf.pal.bookmark.pager;
public class CategoryPager extends DefaultPager {
+
+ private static final long serialVersionUID = -6261666956617549130L;
+
private String createdBy;
protected int getDefaultPageSize() {
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -20,7 +20,7 @@
private static final long serialVersionUID = 1L;
- private CategoryBhv categoryBhv;
+ private transient CategoryBhv categoryBhv;
private PagerDxo pagerDxo;
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;
+import jp.sf.pal.bookmark.BookmarkConstants;
import jp.sf.pal.bookmark.db.allcommon.cbean.PagingResultBean;
import jp.sf.pal.bookmark.db.cbean.LinkCB;
import jp.sf.pal.bookmark.db.exbhv.LinkBhv;
@@ -20,7 +21,7 @@
private static final long serialVersionUID = 1L;
- private LinkBhv linkBhv;
+ private transient LinkBhv linkBhv;
private PagerDxo pagerDxo;
@@ -36,7 +37,13 @@
// setup
if (linkPager.getCreatedBy() != null) {
- cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
+ if (linkPager.getCategoryId() != null) {
+ if (linkPager.getCategoryId() != BookmarkConstants.SHARED_CATEGORY_ID) {
+ cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
+ }
+ } else {
+ cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
+ }
}
if (linkPager.getCategoryId() != null) {
cb.query().setCategoryId_Equal(linkPager.getCategoryId());
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/util/DateUtil.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/util/DateUtil.java 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/util/DateUtil.java 2008-10-27 02:47:44 UTC (rev 1245)
@@ -232,7 +232,7 @@
age--;
}
}
- return new Integer(age);
+ return Integer.valueOf(age);
}
return null;
}
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp 2008-10-27 01:52:57 UTC (rev 1244)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp 2008-10-27 02:47:44 UTC (rev 1245)
@@ -28,8 +28,8 @@
<td><a href="${l.url}" target="${l.type == 'W' ? '_blank' : '_self'}">${f:h(l.name)}</a></td>
<td>${f:h(l.createdBy)}</a></td>
<td align="center">
- <s:link href="editpage/2/${f:u(c.id)}">編集</s:link>
- <s:link href="deletepage/3/${f:u(c.id)}">削除</s:link>
+ <s:link href="editpage/2/${f:u(l.id)}">編集</s:link>
+ <s:link href="deletepage/3/${f:u(l.id)}">削除</s:link>
</td>
</tr>
</c:forEach>