From e89da88852f0d80efe31381faae0906c330c0cb8 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 29 Jan 2019 20:33:28 +0100 Subject: [PATCH] Fix for EasyUI bug with footer refresh --- Site/App_GlobalResources/Global.designer.cs | 18 ++++++++++++++++++ Site/App_GlobalResources/Global.resx | 7 +++++++ ...Json-MasterPersonEditPaymentHistory.aspx.cs | 14 ++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index e98ffb0c..447534c7 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -627,6 +627,15 @@ namespace Resources { } } + /// + /// Looks up a localized string similar to There are no payments on record. + /// + internal static string Financial_NoPaymentHistory { + get { + return ResourceManager.GetString("Financial_NoPaymentHistory", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invoices. /// @@ -1203,6 +1212,15 @@ namespace Resources { } } + /// + /// Looks up a localized string similar to No records. + /// + internal static string Global_EmptySet { + get { + return ResourceManager.GetString("Global_EmptySet", resourceCulture); + } + } + /// /// Looks up a localized string similar to You are entering the <strong>Sandbox</strong> organization.<br/><br/>This is a safe environment where you can play around with Swarmops without risking any damage to production data. Have fun all you want, and return to your production environment when you're done experimenting.. /// diff --git a/Site/App_GlobalResources/Global.resx b/Site/App_GlobalResources/Global.resx index 99b6ebcd..429ecbb4 100644 --- a/Site/App_GlobalResources/Global.resx +++ b/Site/App_GlobalResources/Global.resx @@ -1018,6 +1018,9 @@ Current Balance + + There are no payments on record + Owed As in, "Amount Owed" @@ -1065,6 +1068,10 @@ Closed As in "record closed" + + No records + There are no records of the requested type + Item As in "record", "list item", something listed diff --git a/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs b/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs index c9692796..9da03cc6 100644 --- a/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs +++ b/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs @@ -183,6 +183,20 @@ namespace Swarmops.Frontend.Automation StringBuilder result = new StringBuilder(16384); result.Append("["); + if (items.Any()) + { + // Must return something in body to refresh footer - EasyUI bug + + result.AppendFormat( + "\"id\":\"NoRecords\",\"name\":\"{0}\",\"description\":\"{1}\"", + JsonSanitize(Resources.Global.Global_EmptySet), + JsonSanitize(Resources.Global.Financial_NoPaymentHistory) + ); + result.Append("}]"); + + return result.ToString(); + } + foreach (PaymentHistoryLineItem item in items) { result.Append("{");