You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/11/27 13:53:37 UTC
svn commit: r1206715 -
/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Author: mgrigorov
Date: Sun Nov 27 12:53:36 2011
New Revision: 1206715
URL: http://svn.apache.org/viewvc?rev=1206715&view=rev
Log:
WICKET-4266
AjaxEditableLabel does not work when using CryptoMapper
Modified:
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Modified: wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1206715&r1=1206714&r2=1206715&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Sun Nov 27 12:53:36 2011
@@ -97,12 +97,16 @@ public class AjaxEditableLabel<T> extend
protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
+
+ String callbackUrl = getCallbackUrl().toString();
+ char separator = (callbackUrl != null && callbackUrl.indexOf('?') > -1) ? '&' : '?';
+
final String saveCall = "{" +
- generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() +
- "&save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}";
+ generateCallbackScript("wicketAjaxGet('" + callbackUrl + separator +
+ "save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}";
final String cancelCall = "{" +
- generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() + "&save=false'") +
+ generateCallbackScript("wicketAjaxGet('" + callbackUrl + separator + "save=false'") +
"; return false;}";