Author: vbriand Date: 2011-01-14 14:24:54 +0100 (Fri, 14 Jan 2011) New Revision: 172 Url: http://chorem.org/repositories/revision/bow/172 Log: Fixed all bugs when editing a bookmark Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-14 13:24:54 UTC (rev 172) @@ -9,24 +9,24 @@ public class ModifyBookmarkAction extends BowBaseAction { private static final long serialVersionUID = 8197008295267924063L; - protected String url; + protected String link; protected String name; protected String alias; protected String tags; protected String bookmarkId; /** - * @return the url + * @return the link */ - public String getUrl() { - return url; + public String getLink() { + return link; } /** - * @param url the url to set + * @param url the linkto set */ - public void setUrl(String url) { - this.url = url; + public void setLink(String link) { + this.link = link; } /** @@ -97,7 +97,7 @@ alias = bookmark.getAlias(); } } - BookmarkActions.updateBookmark(bookmark, name, url, tags, alias); + BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } return SUCCESS; Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-14 13:24:54 UTC (rev 172) @@ -1,6 +1,8 @@ bow.action.locale.english=English bow.action.locale.french=French bow.bookmark.badFileFormat= +bow.bookmark.description=Description +bow.bookmark.tags=Tags bow.bookmarks.noBookmarks=No bookmarks bow.config.alias.url.description= bow.config.application.version.description= @@ -70,6 +72,7 @@ bow.rightMenu.fullTextSearch=Full text search bow.rightMenu.import.submit=Import bow.rightMenu.importBookmarks=Import bookmarks +bow.rightMenu.logout=Logout bow.rightMenu.search=Search bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-14 13:24:54 UTC (rev 172) @@ -1,6 +1,8 @@ bow.action.locale.english=Anglais bow.action.locale.french=Fran\u00E7ais bow.bookmark.badFileFormat= +bow.bookmark.description=Description +bow.bookmark.tags=Tags bow.bookmarks.noBookmarks=Pas de marque-page bow.config.alias.url.description= bow.config.application.version.description= @@ -70,6 +72,7 @@ bow.rightMenu.fullTextSearch=Recherche full text bow.rightMenu.import.submit=Importer bow.rightMenu.importBookmarks=Importer des marque-pages +bow.rightMenu.logout=D\u00E9connexion bow.rightMenu.search=Recherche bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/resources/struts.xml 2011-01-14 13:24:54 UTC (rev 172) @@ -4,6 +4,7 @@ "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> <package name="myPackage" extends="struts-default"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-14 13:24:54 UTC (rev 172) @@ -43,11 +43,15 @@ <s:set var="searchLine" value="%{#request.searchLine}" /> <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> + <s:set var="bookmarkLink" value="%{#request.bookmark.getLink()}" /> + <s:set var="bookmarkAlias" value="%{#request.bookmark.getAlias()}" /> + <s:set var="bookmarkDescription" value="%{#request.bookmark.getDescription()}" /> + <s:set var="bookmarkClicks" value="%{#request.bookmark.getClick()}" /> <div class="bookmark"> <div class="bookmarkhead"> <a class="alias" href="<%=aliasUrl + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" onclick="window.open(this.href); return false;"> - <%=bookmark.getAlias()%> + <s:property value="%{#bookmarkAlias}" /> </a> <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> @@ -55,7 +59,7 @@ <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> </s:url> - <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#request.bookmark.getDescription()}', '%{#request.bookmark.getAlias()}', '%{#request.bookmark.getTags()}', '%{#request.bookmark.getLink()}', '%{editBookmark}', '%{#wikittyId}');"></s:a> + <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkActions@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmark}', '%{#wikittyId}');"></s:a> <s:url id="removeBookmark" action="removeBookmark" escapeAmp="false"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> @@ -65,17 +69,17 @@ </div> <div class="bookmarkcontenu"> <div class="screenshot"></div> - <div class="click"><%=bookmark.getClick()%></div> + <div class="click"><s:property value="%{#bookmarkClicks}" /></div> <div class="description"> - <h3>Description :</h3> + <h3><s:text name="bow.bookmark.description" /> :</h3> <p> <s:url id="addClick" action="addClick"> - <s:param name="bookmarkId"><%=bookmark.getWikittyId()%></s:param> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> </s:url> - <s:a title="%{#request.bookmark.getLink()}" href="%{addClick}" onclick="window.open(this.href); return false;"><%=bookmark.getDescription()%></s:a> + <s:a title="%{#bookmarkLink}" href="%{addClick}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a> </p> <p class="tags"> - <strong>Tags :</strong> + <strong><s:text name="bow.bookmark.tags" /> :</strong> <% Set<String> tagList = bookmark.getTags(); Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-13 18:04:39 UTC (rev 171) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-14 13:24:54 UTC (rev 172) @@ -65,7 +65,7 @@ String formName = (String)request.getAttribute("name"); String formTags = (String)request.getAttribute("tags"); String formAlias = (String)request.getAttribute("alias"); -String formAction = (String)request.getAttribute("formAction"); //TODO : modifier le nom action en formAction parce que sinon ça fait tout péter +String formAction = (String)request.getAttribute("formAction"); if (formLink == null) formLink = "URL"; @@ -84,7 +84,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <s:form action="logout"> - <s:submit name="bow.rightMenu.logout" /> + <s:submit key="bow.rightMenu.logout" /> </s:form> <a href="http://maven-site.chorem.org/bow/" class="help" onclick="window.open(this.href); return false;"><s:text name="bow.rightMenu.help" /></a> </div> @@ -109,7 +109,7 @@ <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" /> + <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" /> <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" /> <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" /> <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" />