From 3bb04f4ae0d7879372d4c54aa47b5d95b436729b Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 13 Jun 2014 09:43:41 +0000 Subject: [PATCH] Bugfixes for a) nondisplay of space-padded fields in table, b) multiple-item payouts --- Site5/App_Code/DataV5Base.cs | 2 +- Site5/Pages/v5/Financial/PayOutMoney.aspx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Site5/App_Code/DataV5Base.cs b/Site5/App_Code/DataV5Base.cs index 8d1feefd..c014abd2 100644 --- a/Site5/App_Code/DataV5Base.cs +++ b/Site5/App_Code/DataV5Base.cs @@ -217,7 +217,7 @@ public class DataV5Base : System.Web.UI.Page protected static string JsonSanitize (string input) { - return input.Replace("\"", "\\\""); + return input.Replace("\"", "\\\"").Replace(" ", " ").Trim(); } } diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx b/Site5/Pages/v5/Financial/PayOutMoney.aspx index 77e3cd00..d8f6ee2a 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx @@ -71,7 +71,7 @@ $(thisIcon).css("display", "none"); $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); $(thisIcon).attr("rel", "active"); - $("#IconApproved" + $(thisIcon).attr("baseid")).fadeIn(100); + $("#IconApproved" + $(thisIcon).attr("baseid").replace(/\|/g, '')).fadeIn(100); alertify.success(unescape(msg.d.DisplayMessage)); } }); @@ -87,7 +87,7 @@ $.ajax({ type: "POST", url: "PayOutMoney.aspx/UndoPayout", - data: "{'databaseId': '" + $("#IconApproval" + $(thisIcon).attr("baseid")).attr("databaseid") + "'}", + data: "{'databaseId': '" + $("#IconApproval" + $(thisIcon).attr("baseid").replace(/\|/g, '')).attr("databaseid") + "'}", contentType: "application/json; charset=utf-8", dataType: "json", success: function (msg) {