svnno****@sourc*****
svnno****@sourc*****
2008年 11月 22日 (土) 08:00:53 JST
Revision: 1395
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1395
Author: shinsuke
Date: 2008-11-22 08:00:53 +0900 (Sat, 22 Nov 2008)
Log Message:
-----------
fixed sort problem.
Modified Paths:
--------------
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
-------------- next part --------------
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java 2008-11-21 22:40:35 UTC (rev 1394)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java 2008-11-21 23:00:53 UTC (rev 1395)
@@ -147,7 +147,7 @@
new Object[] { categoryForm.id });
}
try {
- categoryService.moveUp(category);
+ categoryService.moveDown(category);
BookmarkUtil.addMessage(request, "success.move_category_up");
} catch (ActionMessagesException e) {
throw e;
@@ -171,7 +171,7 @@
new Object[] { categoryForm.id });
}
try {
- categoryService.moveDown(category);
+ categoryService.moveUp(category);
BookmarkUtil.addMessage(request, "success.move_category_down");
} catch (ActionMessagesException e) {
throw e;
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java 2008-11-21 22:40:35 UTC (rev 1394)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java 2008-11-21 23:00:53 UTC (rev 1395)
@@ -135,8 +135,8 @@
return "confirm.jsp";
}
- @Execute(validator = false, input = "error.jsp", urlPattern = "moveup/{id}")
- public String moveup() {
+ @Execute(validator = false, input = "error.jsp", urlPattern = "movedown/{id}")
+ public String movedown() {
if (categoryForm.id == null) {
throw new ActionMessagesException("errors.invalid.id");
}
@@ -147,8 +147,8 @@
new Object[] { categoryForm.id });
}
try {
- categoryService.moveUp(category);
- BookmarkUtil.addMessage(request, "success.move_category_up");
+ categoryService.moveDown(category);
+ BookmarkUtil.addMessage(request, "success.move_category_down");
} catch (ActionMessagesException e) {
throw e;
} catch (Exception e) {
@@ -159,8 +159,8 @@
return displayList();
}
- @Execute(validator = false, input = "error.jsp", urlPattern = "movedown/{id}")
- public String movedown() {
+ @Execute(validator = false, input = "error.jsp", urlPattern = "moveup/{id}")
+ public String moveup() {
if (categoryForm.id == null) {
throw new ActionMessagesException("errors.invalid.id");
}
@@ -171,8 +171,8 @@
new Object[] { categoryForm.id });
}
try {
- categoryService.moveDown(category);
- BookmarkUtil.addMessage(request, "success.move_category_down");
+ categoryService.moveUp(category);
+ BookmarkUtil.addMessage(request, "success.move_category_up");
} catch (ActionMessagesException e) {
throw e;
} catch (Exception e) {
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java 2008-11-21 22:40:35 UTC (rev 1394)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java 2008-11-21 23:00:53 UTC (rev 1395)
@@ -60,7 +60,7 @@
id = null;
name = null;
memo = null;
- type = null;
+ type = BookmarkConstants.PERSONAL_CATEGORY;
sortOrder = null;
createdTime = null;
createdBy = null;
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-11-21 22:40:35 UTC (rev 1394)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2008-11-21 23:00:53 UTC (rev 1395)
@@ -137,11 +137,12 @@
bookmarkCategoryBhv.update(category);
}
- public void moveUp(BookmarkCategory category) {
+ public void moveDown(BookmarkCategory category) {
BookmarkCategoryCB cb = new BookmarkCategoryCB();
cb.fetchFirst(1);
cb.fetchFirst(1);
cb.query().setSortOrder_GreaterThan(category.getSortOrder());
+ cb.query().setCreatedBy_Equal(category.getCreatedBy());
cb.query().addOrderBy_SortOrder_Asc();
List<BookmarkCategory> categoryList = bookmarkCategoryBhv
.selectPage(cb);
@@ -159,11 +160,12 @@
}
}
- public void moveDown(BookmarkCategory category) {
+ public void moveUp(BookmarkCategory category) {
BookmarkCategoryCB cb = new BookmarkCategoryCB();
cb.fetchFirst(1);
cb.fetchFirst(1);
cb.query().setSortOrder_LessThan(category.getSortOrder());
+ cb.query().setCreatedBy_Equal(category.getCreatedBy());
cb.query().addOrderBy_SortOrder_Desc();
List<BookmarkCategory> categoryList = bookmarkCategoryBhv
.selectPage(cb);
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-11-21 22:40:35 UTC (rev 1394)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-11-21 23:00:53 UTC (rev 1395)
@@ -29,13 +29,13 @@
<tr>
<td style="width:50px;text-align: center;border: 0;">
<c:if test="${!s.last || categoryPager.currentPageNumber!=categoryPager.allPageCount}">
- <s:link href="moveup/${f:u(c.id)}"><bean:message key="labels.move_down"/></s:link>
+ <s:link href="movedown/${f:u(c.id)}"><bean:message key="labels.move_down"/></s:link>
</c:if>
</td>
<td style="width:50px;text-align: center;border: 0;">
<c:if test="${!s.first || categoryPager.currentPageNumber!=1}">
- <s:link href="movedown/${f:u(c.id)}"><bean:message key="labels.move_up"/></s:link>
+ <s:link href="moveup/${f:u(c.id)}"><bean:message key="labels.move_up"/></s:link>
</c:if>
</td>