From b1de7db1d1ca89a41ff47e79e21039dbb564df77 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 3 Oct 2017 12:02:31 +0200 Subject: [PATCH] Fixed a problem with single child account not populating tree --- Site/Automation/Json-BudgetsTree.aspx.cs | 2 +- Site/Automation/Json-FinancialAccountsTree.aspx.cs | 2 +- Site/Site.csproj | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Site/Automation/Json-BudgetsTree.aspx.cs b/Site/Automation/Json-BudgetsTree.aspx.cs index ee2f95cb..1f4838cb 100644 --- a/Site/Automation/Json-BudgetsTree.aspx.cs +++ b/Site/Automation/Json-BudgetsTree.aspx.cs @@ -35,7 +35,7 @@ namespace Swarmops.Frontend.Automation // Is this stuff in cache already? - string cacheKey = "ExpensableBudgets-Json-" + accountType + + string cacheKey = "Budgets-Json-" + accountType + // use the sanitized input to prevent cache overload CurrentOrganization.Identity.ToString ((CultureInfo.InvariantCulture)); diff --git a/Site/Automation/Json-FinancialAccountsTree.aspx.cs b/Site/Automation/Json-FinancialAccountsTree.aspx.cs index 3a9bc89a..93ba0d23 100644 --- a/Site/Automation/Json-FinancialAccountsTree.aspx.cs +++ b/Site/Automation/Json-FinancialAccountsTree.aspx.cs @@ -106,7 +106,7 @@ namespace Swarmops.Frontend.Automation return string.Empty; } - if (this._hashedAccounts[rootNodeId].Count == 1) + if (this._hashedAccounts[rootNodeId].Count < 1) { // No children diff --git a/Site/Site.csproj b/Site/Site.csproj index ecfca736..a6bad5dc 100644 --- a/Site/Site.csproj +++ b/Site/Site.csproj @@ -110,13 +110,6 @@ AjaxToggleSlider.ascx - - FileUploader.ascx - ASPXCodeBehind - - - FileUploader.ascx - ImpersonationWarningBox.ascx ASPXCodeBehind @@ -690,7 +683,6 @@ -