svnno****@sourc*****
svnno****@sourc*****
2008年 11月 29日 (土) 08:38:27 JST
Revision: 1472
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1472
Author: shinsuke
Date: 2008-11-29 08:38:27 +0900 (Sat, 29 Nov 2008)
Log Message:
-----------
fixed permission problem and sort order problem.
Modified Paths:
--------------
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/dxo/LinkDxo.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java
bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/LinkForm.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/resources/application.properties
bookmark/trunk/src/main/resources/application_ja.properties
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/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-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -18,12 +18,13 @@
public static final String FALSE = "F";
+ // TODO remove
public static final Integer DEFAULT_CATEGORY_ID = Integer.valueOf(1);
- public static final int SHARED_CATEGORY_ID = 2;
+ public static final String DEFAULT_CATEGORY = "D";
public static final String PUBLIC_CATEGORY = "P";
- public static final String PERSONAL_CATEGORY = "C";
+ public static final String PRIVATE_CATEGORY = "R";
}
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -28,8 +28,6 @@
private static final Log log = LogFactory.getLog(LinkAction.class);
- public List<BookmarkCategory> categoryItems;
-
// for list
public List<BookmarkLink> linkItems;
@@ -58,8 +56,6 @@
linkPager.setCreatedBy(username);
linkItems = linkService.getLinkList(linkPager);
- categoryItems = categoryService.getCategoryList(username);
-
return "index.jsp";
}
@@ -93,8 +89,6 @@
@Execute(validator = false, input = "error.jsp")
public String editagain() {
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
return "edit.jsp";
}
@@ -107,9 +101,6 @@
linkForm.mode });
}
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
-
// update edit page
loadDetailsPageParameters();
@@ -124,9 +115,6 @@
linkForm.initialize();
linkForm.mode = BookmarkConstants.CREATE_MODE;
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
-
// update edit page
loadDetailsPageParameters();
@@ -137,9 +125,6 @@
public String editpage() {
linkForm.mode = BookmarkConstants.EDIT_MODE;
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
-
// update edit page
loadDetailsPageParameters();
@@ -150,9 +135,6 @@
@Execute(validator = true, input = "edit.jsp")
public String confirm() {
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
-
return "confirm.jsp";
}
@@ -160,9 +142,6 @@
public String deletepage() {
linkForm.mode = BookmarkConstants.DELETE_MODE;
- String username = request.getRemoteUser();
- categoryItems = categoryService.getCategoryList(username);
-
// update edit page
loadDetailsPageParameters();
@@ -171,8 +150,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 (linkForm.id == null) {
throw new ActionMessagesException("errors.invalid.id");
}
@@ -182,8 +161,8 @@
new Object[] { linkForm.id });
}
try {
- linkService.moveUp(link);
- BookmarkUtil.addMessage(request, "success.move_link_up");
+ linkService.moveDown(link);
+ BookmarkUtil.addMessage(request, "success.move_link_down");
} catch (ActionMessagesException e) {
throw e;
} catch (Exception e) {
@@ -193,8 +172,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 (linkForm.id == null) {
throw new ActionMessagesException("errors.invalid.id");
}
@@ -204,8 +183,8 @@
new Object[] { linkForm.id });
}
try {
- linkService.moveDown(link);
- BookmarkUtil.addMessage(request, "success.move_link_down");
+ linkService.moveUp(link);
+ BookmarkUtil.addMessage(request, "success.move_link_up");
} catch (ActionMessagesException e) {
throw e;
} catch (Exception e) {
@@ -311,6 +290,40 @@
private void loadDetailsPageParameters() {
}
+ public List<BookmarkCategory> getCategoryItems() {
+ String username = request.getRemoteUser();
+ return categoryService.getCategoryList(username);
+ }
+
+ public List<BookmarkCategory> getEditableCategoryItems() {
+ String username = request.getRemoteUser();
+ return categoryService.getEditableCategoryList(username);
+ }
+
+ public String getUserId() {
+ return request.getRemoteUser();
+ }
+
+ public boolean isEditable() {
+ String type = linkForm.categoryType;
+ if (type != null) {
+ String userId = request.getRemoteUser();
+ if (BookmarkConstants.DEFAULT_CATEGORY.equals(type)) {
+ if (userId != null && userId.equals(linkForm.createdBy)) {
+ return true;
+ }
+ }
+ String createdBy = linkForm.categoryCreatedBy;
+ if (createdBy != null) {
+ if (userId != null && userId.equals(createdBy)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
/**
* @return the request
*/
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/dxo/LinkDxo.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/dxo/LinkDxo.java 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/dxo/LinkDxo.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -29,7 +29,8 @@
+ ", deletedTime : deletedTime" //
+ ", deletedBy : deletedBy" //
// + ", versionno : versionno" //
- )
+ + ", categoryType : bookmarkCategory.type"
+ + ", categoryCreatedBy : bookmarkCategory.createdBy")
public void convertFromLinkToForm(BookmarkLink link, LinkForm form);
@ExcludeNull
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-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/CategoryForm.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -60,7 +60,7 @@
id = null;
name = null;
memo = null;
- type = BookmarkConstants.PERSONAL_CATEGORY;
+ type = BookmarkConstants.PRIVATE_CATEGORY;
sortOrder = null;
createdTime = null;
createdBy = null;
Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/LinkForm.java
===================================================================
--- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/LinkForm.java 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/form/user/LinkForm.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -27,6 +27,8 @@
@Maxbytelength(maxbytelength = 200)
public String memo;
+ @Required(target = "confirm,create,update,delete")
+ @Maxbytelength(maxbytelength = 255)
public String url;
public String type;
@@ -58,6 +60,10 @@
@IntegerType
public String pageNumber;
+ public String categoryType;
+
+ public String categoryCreatedBy;
+
public void initialize() {
mode = BookmarkConstants.LIST_MODE;
id = null;
@@ -73,7 +79,8 @@
updatedBy = null;
deletedTime = null;
deletedBy = null;
-
+ categoryType = null;
+ categoryCreatedBy = 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-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -2,7 +2,6 @@
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -10,6 +9,7 @@
import jp.sf.pal.bookmark.common.dxo.PagerDxo;
import jp.sf.pal.bookmark.common.util.PagingResultBeanWrapper;
import jp.sf.pal.bookmark.db.allcommon.cbean.PagingResultBean;
+import jp.sf.pal.bookmark.db.allcommon.cbean.UnionQuery;
import jp.sf.pal.bookmark.db.cbean.BookmarkCategoryCB;
import jp.sf.pal.bookmark.db.cbean.UserInfoCB;
import jp.sf.pal.bookmark.db.exbhv.BookmarkCategoryBhv;
@@ -195,29 +195,49 @@
}
}
- public List<BookmarkCategory> getCategoryList(String createdBy) {
+ public List<BookmarkCategory> getCategoryList(final String createdBy) {
- List<BookmarkCategory> bookmarkCategoryList = new ArrayList<BookmarkCategory>();
-
BookmarkCategoryCB cb = new BookmarkCategoryCB();
// setup
cb.query().setDeletedBy_IsNull();
- cb.query().setType_Equal(BookmarkConstants.PUBLIC_CATEGORY);
+ cb.query().setType_NotEqual(BookmarkConstants.PRIVATE_CATEGORY);
+ cb.unionAll(new UnionQuery<BookmarkCategoryCB>() {
+ public void query(BookmarkCategoryCB unionCB) {
+ unionCB.query().setDeletedBy_IsNull();
+ unionCB.query().setType_Equal(
+ BookmarkConstants.PRIVATE_CATEGORY);
+ unionCB.query().setCreatedBy_Equal(createdBy);
+ }
+ });
+ cb.query().addOrderBy_Type_Asc();
cb.query().addOrderBy_SortOrder_Asc();
- bookmarkCategoryList.addAll(bookmarkCategoryBhv.selectList(cb));
+ return bookmarkCategoryBhv.selectList(cb);
- cb = new BookmarkCategoryCB();
+ }
+
+ public List<BookmarkCategory> getEditableCategoryList(final String createdBy) {
+
+ BookmarkCategoryCB cb = new BookmarkCategoryCB();
+
+ // setup
+
+ cb.query().setDeletedBy_IsNull();
cb.query().setCreatedBy_Equal(createdBy);
- cb.query().setDeletedBy_IsNull();
- cb.query().setType_Equal(BookmarkConstants.PERSONAL_CATEGORY);
+ cb.unionAll(new UnionQuery<BookmarkCategoryCB>() {
+ public void query(BookmarkCategoryCB unionCB) {
+ unionCB.query().setDeletedBy_IsNull();
+ unionCB.query().setType_Equal(
+ BookmarkConstants.DEFAULT_CATEGORY);
+ unionCB.query().setCreatedBy_NotEqual(createdBy);
+ }
+ });
+ cb.query().addOrderBy_Type_Asc();
cb.query().addOrderBy_SortOrder_Asc();
- bookmarkCategoryList.addAll(bookmarkCategoryBhv.selectList(cb));
-
- return bookmarkCategoryList;
+ return bookmarkCategoryBhv.selectList(cb);
}
public BookmarkCategoryBhv getBookmarkCategoryBhv() {
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-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java 2008-11-28 23:38:27 UTC (rev 1472)
@@ -13,6 +13,7 @@
import jp.sf.pal.bookmark.db.cbean.UserInfoCB;
import jp.sf.pal.bookmark.db.exbhv.BookmarkLinkBhv;
import jp.sf.pal.bookmark.db.exbhv.UserInfoBhv;
+import jp.sf.pal.bookmark.db.exentity.BookmarkCategory;
import jp.sf.pal.bookmark.db.exentity.BookmarkLink;
import jp.sf.pal.bookmark.db.exentity.UserInfo;
import jp.sf.pal.bookmark.pager.LinkPager;
@@ -30,6 +31,8 @@
private transient UserInfoBhv userInfoBhv;
+ private CategoryService categoryService;
+
private void initUserInfo(String userId) {
UserInfoCB cb = new UserInfoCB();
cb.query().setUserId_Equal(userId);
@@ -57,11 +60,20 @@
cb.fetchPage(linkPager.getCurrentPageNumber());
// setup
+ cb.setupSelect_BookmarkCategory();
+ cb.specify().specifyBookmarkCategory().columnType();
+ cb.specify().specifyBookmarkCategory().columnCreatedBy();
if (linkPager.getCreatedBy() != null) {
if (linkPager.getCategoryId() != null) {
- if (linkPager.getCategoryId() != BookmarkConstants.SHARED_CATEGORY_ID) {
+ BookmarkCategory bookmarkCategory = categoryService
+ .getCategory(linkPager.getCategoryId());
+ if (BookmarkConstants.DEFAULT_CATEGORY.equals(bookmarkCategory
+ .getType())) {
cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
+ } else if (BookmarkConstants.PRIVATE_CATEGORY
+ .equals(bookmarkCategory.getType())) {
+ cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
}
} else {
cb.query().setCreatedBy_Equal(linkPager.getCreatedBy());
@@ -90,6 +102,9 @@
BookmarkLinkCB cb = new BookmarkLinkCB();
// setup
+ cb.setupSelect_BookmarkCategory();
+ cb.specify().specifyBookmarkCategory().columnType();
+ cb.specify().specifyBookmarkCategory().columnCreatedBy();
cb.query().setId_Equal(id);
return bookmarkLinkBhv.selectEntity(cb);
@@ -143,18 +158,26 @@
bookmarkLinkBhv.update(link);
}
- public void moveUp(BookmarkLink link) {
+ public void moveDown(BookmarkLink link) {
BookmarkLinkCB cb = new BookmarkLinkCB();
cb.fetchFirst(1);
cb.fetchFirst(1);
- cb.query().setSortOrder_GreaterThan(link.getSortOrder());
+ cb.query().setId_NotEqual(link.getId());
+ cb.query().setSortOrder_GreaterEqual(link.getSortOrder());
+ cb.query().setCategoryId_Equal(link.getCategoryId());
cb.query().addOrderBy_SortOrder_Asc();
List<BookmarkLink> linkList = bookmarkLinkBhv.selectPage(cb);
if (linkList != null && !linkList.isEmpty()) {
BookmarkLink targetLink = linkList.get(0);
- Integer sortOrder = targetLink.getSortOrder();
- targetLink.setSortOrder(link.getSortOrder());
- link.setSortOrder(sortOrder);
+ Integer sortOrder1 = targetLink.getSortOrder();
+ Integer sortOrder2 = link.getSortOrder();
+ if (sortOrder1.intValue() == sortOrder2.intValue()) {
+ targetLink.setSortOrder(sortOrder2);
+ link.setSortOrder(sortOrder1 + 1);
+ } else {
+ targetLink.setSortOrder(sortOrder2);
+ link.setSortOrder(sortOrder1);
+ }
bookmarkLinkBhv.update(targetLink);
bookmarkLinkBhv.update(link);
} else {
@@ -164,18 +187,26 @@
}
}
- public void moveDown(BookmarkLink link) {
+ public void moveUp(BookmarkLink link) {
BookmarkLinkCB cb = new BookmarkLinkCB();
cb.fetchFirst(1);
cb.fetchFirst(1);
- cb.query().setSortOrder_LessThan(link.getSortOrder());
+ cb.query().setId_NotEqual(link.getId());
+ cb.query().setSortOrder_LessEqual(link.getSortOrder());
cb.query().addOrderBy_SortOrder_Desc();
+ cb.query().setCategoryId_Equal(link.getCategoryId());
List<BookmarkLink> linkList = bookmarkLinkBhv.selectPage(cb);
if (linkList != null && !linkList.isEmpty()) {
BookmarkLink targetLink = linkList.get(0);
- Integer sortOrder = targetLink.getSortOrder();
- targetLink.setSortOrder(link.getSortOrder());
- link.setSortOrder(sortOrder);
+ Integer sortOrder1 = targetLink.getSortOrder();
+ Integer sortOrder2 = link.getSortOrder();
+ if (sortOrder1.intValue() == sortOrder2.intValue()) {
+ targetLink.setSortOrder(sortOrder2 + 1);
+ link.setSortOrder(sortOrder1);
+ } else {
+ targetLink.setSortOrder(sortOrder2);
+ link.setSortOrder(sortOrder1);
+ }
bookmarkLinkBhv.update(targetLink);
bookmarkLinkBhv.update(link);
} else {
@@ -209,4 +240,12 @@
this.userInfoBhv = userInfoBhv;
}
+ public CategoryService getCategoryService() {
+ return categoryService;
+ }
+
+ public void setCategoryService(CategoryService categoryService) {
+ this.categoryService = categoryService;
+ }
+
}
Modified: bookmark/trunk/src/main/resources/application.properties
===================================================================
--- bookmark/trunk/src/main/resources/application.properties 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/resources/application.properties 2008-11-28 23:38:27 UTC (rev 1472)
@@ -86,3 +86,5 @@
errors.could_not_find_link=Could not find the link information({0}).
errors.could_not_find_link_for_moving_up=Could not find the link information for moving it up.
errors.could_not_find_link_for_moving_down=Could not find the link information for moving it down.
+
+labels.default=Default
Modified: bookmark/trunk/src/main/resources/application_ja.properties
===================================================================
--- bookmark/trunk/src/main/resources/application_ja.properties 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/resources/application_ja.properties 2008-11-28 23:38:27 UTC (rev 1472)
@@ -80,3 +80,5 @@
errors.could_not_find_link=\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002(ID:{0})
errors.could_not_find_link_for_moving_up=\u4e0a\u306b\u79fb\u52d5\u3059\u308b\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
errors.could_not_find_link_for_moving_down=\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+
+labels.default=\u30c7\u30d5\u30a9\u30eb\u30c8
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -43,8 +43,9 @@
<tr>
<th><bean:message key="labels.shared"/></th>
<td>
+<c:if test="${type=='R'}"><bean:message key="labels.personal"/></c:if>
<c:if test="${type=='P'}"><bean:message key="labels.public"/></c:if>
-<c:if test="${type=='C'}"><bean:message key="labels.personal"/></c:if>
+<c:if test="${type=='D'}"><bean:message key="labels.default"/></c:if>
<html:hidden property="type"/>
</td>
</tr>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -45,8 +45,9 @@
<th><bean:message key="labels.shared"/></th>
<td>
<html:select property="type">
+<html:option value="R"><bean:message key="labels.personal"/></html:option>
<html:option value="P"><bean:message key="labels.public"/></html:option>
-<html:option value="C"><bean:message key="labels.personal"/></html:option>
+<html:option value="D"><bean:message key="labels.default"/></html:option>
</html:select>
</td>
</tr>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -40,8 +40,8 @@
<tr>
<th><bean:message key="labels.shared"/></th>
<td>
+<c:if test="${type=='R'}"><bean:message key="labels.personal"/></c:if>
<c:if test="${type=='P'}"><bean:message key="labels.public"/></c:if>
-<c:if test="${type=='C'}"><bean:message key="labels.personal"/></c:if>
<html:hidden property="type"/>
</td>
</tr>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -41,8 +41,8 @@
<th><bean:message key="labels.shared"/></th>
<td>
<html:select property="type">
+<html:option value="R"><bean:message key="labels.personal"/></html:option>
<html:option value="P"><bean:message key="labels.public"/></html:option>
-<html:option value="C"><bean:message key="labels.personal"/></html:option>
</html:select>
</td>
</tr>
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-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -37,7 +37,7 @@
</thead>
<tbody>
<c:forEach var="c" varStatus="s" items="${categoryItems}">
- <tr>
+ <tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
<td>${f:h(c.name)}(${c.sortOrder})</td>
<td>
<table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -50,6 +50,8 @@
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
+ <html:hidden property="categoryType"/>
+ <html:hidden property="categoryCreatedBy"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.confirm_link"/></caption>
@@ -69,7 +71,7 @@
<tr>
<th><bean:message key="labels.category"/></th>
<td>
-<c:forEach var="category" varStatus="s" items="${categoryItems}">
+<c:forEach var="category" varStatus="s" items="${editableCategoryItems}">
<c:if test="${categoryId == category.id}">${f:h(category.name)}</c:if>
</c:forEach>
<html:hidden property="categoryId"/>
@@ -101,7 +103,7 @@
</c:if>
<c:if test="${mode == 4}">
<input type="submit" name="back" value="<bean:message key="labels.back"/>"/>
- <c:if test="${categoryId!=2}">
+ <c:if test="${editable}">
<input type="submit" name="editpage" value="<bean:message key="labels.edit"/>"/>
<input type="submit" name="deletepage" value="<bean:message key="labels.delete"/>"/>
</c:if>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -50,6 +50,8 @@
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
+ <html:hidden property="categoryType"/>
+ <html:hidden property="categoryCreatedBy"/>
<div class="form-table">
<table style="width: 580px;">
<caption><bean:message key="labels.create_link_2"/></caption>
@@ -70,7 +72,7 @@
<th><bean:message key="labels.category"/></th>
<td>
<html:select property="categoryId">
- <c:forEach var="category" varStatus="s" items="${categoryItems}">
+ <c:forEach var="category" varStatus="s" items="${editableCategoryItems}">
<html:option value="${f:h(category.id)}">${f:h(category.name)}</html:option>
</c:forEach>
</html:select>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-11-28 13:36:13 UTC (rev 1471)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-11-28 23:38:27 UTC (rev 1472)
@@ -65,25 +65,25 @@
<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
<td><a href="${l.url}" target="${l.type == 'W' ? '_blank' : '_self'}">${f:h(l.name)}</a></td>
<td>
- <c:if test="${linkPager.categoryId!=2}">
+ <c:if test="${l.bookmarkCategory.createdBy==userId||l.bookmarkCategory.type=='D'}">
<table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
<tr>
<td style="width:50px;text-align: center;border: 0;">
<c:if test="${!s.last || linkPager.currentPageNumber!=linkPager.allPageCount}">
- <s:link href="moveup/${f:u(l.id)}"><bean:message key="labels.move_down"/></s:link>
+ <s:link href="movedown/${f:u(l.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 || linkPager.currentPageNumber!=1}">
- <s:link href="movedown/${f:u(l.id)}"><bean:message key="labels.move_up"/></s:link>
+ <s:link href="moveup/${f:u(l.id)}"><bean:message key="labels.move_up"/></s:link>
</c:if>
</td>
</tr>
</table>
</c:if>
- <c:if test="${linkPager.categoryId==2}"> </c:if>
+ <c:if test="${l.bookmarkCategory.createdBy!=userId&&l.bookmarkCategory.type!='D'}"> </c:if>
</td>
<td align="center"><s:link href="confirmpage/4/${f:u(l.id)}"><bean:message key="labels.detail"/></s:link></td>
</tr>