branch develop updated (ffebec5 -> e6c7ee8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from ffebec5 bug fixes: '' -> ', {0} -> %s (old i18n syntax to new) new 5a93fe2 use " to encapsulate tag string in fullTextLine (prevent interpretation of #) new e6c7ee8 - add getBowUser on BowBaseAction - remove problematics field in form (owner) not very useful (and bug with struts The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e6c7ee822c96fbe5efc54703f8af6dbe2897c7bb Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Aug 3 16:19:20 2015 +0200 - add getBowUser on BowBaseAction - remove problematics field in form (owner) not very useful (and bug with struts commit 5a93fe22b2263ab4ed3810139e9be8852286d95e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Aug 3 16:06:32 2015 +0200 use " to encapsulate tag string in fullTextLine (prevent interpretation of #) Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 4 ++-- .../main/java/org/chorem/bow/action/BowBaseAction.java | 6 ++++++ .../bow/action/sharedUser/SharedUserEditAction.java | 10 +++------- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 17 ++++++++--------- 4 files changed, 19 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 5a93fe22b2263ab4ed3810139e9be8852286d95e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Aug 3 16:06:32 2015 +0200 use " to encapsulate tag string in fullTextLine (prevent interpretation of #) --- bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java index ed3439e..53d4286 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java @@ -55,8 +55,8 @@ public class BookmarkUtils { protected final static WikittyQueryParser queryParser = new WikittyQueryParser(); static { - queryParser.addAlias("tag:", BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS + "~" ); - queryParser.addAlias("tag=", BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS + "=" ); + queryParser.addAlias("tag:([^ $]+)", BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS + "~\"$1\"" ); + queryParser.addAlias("tag=([^ $]+)", BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS + "=\"$1\"" ); queryParser.addAlias("date:([^ $]+)", BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE + "=[date($1/DAY) TO date($1/DAY+1DAY)]"); queryParser.addAlias("before:([^ $]+)", BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE + "<date($1)"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit e6c7ee822c96fbe5efc54703f8af6dbe2897c7bb Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Aug 3 16:19:20 2015 +0200 - add getBowUser on BowBaseAction - remove problematics field in form (owner) not very useful (and bug with struts --- .../main/java/org/chorem/bow/action/BowBaseAction.java | 6 ++++++ .../bow/action/sharedUser/SharedUserEditAction.java | 10 +++------- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 17 ++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java b/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java index daae7b9..283c0e1 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import org.chorem.bow.BookmarkUtils; +import org.chorem.bow.BowUser; /** * Base class which must be extended by every action @@ -101,6 +102,11 @@ public class BowBaseAction extends BaseAction implements SessionAware { return result; } + public BowUser getBowUser() { + BowUser result = getBowSession().getUser(); + return result; + } + public BookmarkUtils getBookmarkUtils() { if (bookmarkUtils == null) { bookmarkUtils = new BookmarkUtils(); diff --git a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java index df2e381..f5c9dca 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.bow.BowSharedUser; import org.chorem.bow.BowSharedUserImpl; import org.chorem.bow.BowProxy; -import org.chorem.bow.BowSession; import org.chorem.bow.BowUser; import org.chorem.bow.BowUtils; import org.chorem.bow.action.BowBaseAction; @@ -76,8 +75,7 @@ public class SharedUserEditAction extends BowBaseAction { if (StringUtils.isBlank(sharedUserId)) { sharedUser = new BowSharedUserImpl(); - BowSession session = getBowSession(); - BowUser user = session.getUser(); + BowUser user = getBowUser(); sharedUser.setOwner(user); String permanentToken = BowUtils.generateToken(); @@ -100,8 +98,7 @@ public class SharedUserEditAction extends BowBaseAction { } String result = SUCCESS; try { - BowSession session = getBowSession(); - BowProxy proxy = session.getProxy(); + BowProxy proxy = getBowProxy(); if (StringUtils.isNotBlank(sharedUser.getLogin())) { proxy.store(sharedUser); @@ -124,8 +121,7 @@ public class SharedUserEditAction extends BowBaseAction { } String result = SUCCESS; try { - BowSession session = getBowSession(); - BowProxy proxy = session.getProxy(); + BowProxy proxy = getBowProxy(); // FIXME poussin 20150730 convert all tag '#<user>' to '<user>' // when user is destroy diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp index a0a9325..28a13d9 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp @@ -38,17 +38,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <div class="formFrame fond"> <s:form id="sharedUserEditForm" cssClass="pretty-form" action="sharedUserSave" method="post"> - <s:hidden name="tagLine" value="%{tagLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:hidden name="sharedUserId" value="%{sharedUserId}"/> - <s:hidden name="sharedUser.owner" value="%{sharedUser.owner}"/> - <s:hidden name="sharedUser.permanentToken" value="%{sharedUser.permanentToken}"/> + <s:hidden name="tagLine" /> + <s:hidden name="fullTextLine" /> + <s:hidden name="sharedUserId"/> - <s:textfield disabled="%{sharedUserId != null}" name="sharedUser.login" labelSeparator=" " key="bow.sharedUserEdit.name" - value="%{sharedUser.login}" /> + <s:textfield disabled="%{sharedUserId != null}" + name="sharedUser.login" + labelSeparator=" " key="bow.sharedUserEdit.name" /> - <s:textfield name="sharedUser.description" labelSeparator=" " key="bow.sharedUserEdit.description" - value="%{sharedUser.description}" /> + <s:textfield name="sharedUser.description" + labelSeparator=" " key="bow.sharedUserEdit.description" /> <s:submit cssClass="submit-button" key="bow.sharedUserEdit.save" name="submit" /> <s:submit disabled="%{sharedUserId == null}" cssClass="submit-button" key="bow.sharedUserEdit.delete" name="delete" action="sharedUserDelete"/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm