From 2aa264b65fa05370442006448b073b8a6a48d034 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 11 Feb 2015 12:30:46 +0100 Subject: [PATCH] Refactor: moved responsibility for including the correct script packages to the controls that use them --- Site5/App_Code/MasterV5Base.cs | 7 +++++++ Site5/App_Code/PageV5Base.cs | 4 ++-- Site5/Controls/v5/Base/ComboGeographies.ascx.cs | 5 +++++ Site5/Controls/v5/Base/FileUpload.ascx.cs | 9 ++++++--- Site5/Controls/v5/Financial/ComboBudgets.ascx.cs | 5 +++++ Site5/Pages/v5/Admin/EditOrganization.aspx.cs | 6 ++---- Site5/Pages/v5/Admin/Settings.aspx.cs | 2 +- Site5/Pages/v5/Comms/SendMassMessage.aspx.cs | 2 -- Site5/Pages/v5/Financial/AttestCosts.aspx.cs | 2 +- Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs | 4 ---- Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs | 3 --- Site5/Pages/v5/Financial/PayOutMoney.aspx.cs | 2 +- Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs | 3 --- Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs | 4 ++-- Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs | 2 +- Site5/Pages/v5/Swarm/AddPerson.aspx.cs | 2 -- Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs | 2 +- 23 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Site5/App_Code/MasterV5Base.cs b/Site5/App_Code/MasterV5Base.cs index 1940c471..6dbbb9d3 100644 --- a/Site5/App_Code/MasterV5Base.cs +++ b/Site5/App_Code/MasterV5Base.cs @@ -27,6 +27,13 @@ public class MasterV5Base : MasterPage public IncludedControl IncludedControlsUsed { get; set; } // as above with IncludedScripts control // ReSharper restore InconsistentNaming + + public MasterV5Base() + { + IncludedControlsUsed = IncludedControl.JsonParameters; // Include this by default to reduce errors + } + + public DateTime PermissionCacheTimestamp { get diff --git a/Site5/App_Code/PageV5Base.cs b/Site5/App_Code/PageV5Base.cs index 1c32286e..04ef3f1e 100644 --- a/Site5/App_Code/PageV5Base.cs +++ b/Site5/App_Code/PageV5Base.cs @@ -41,13 +41,13 @@ public class PageV5Base : Page } // ReSharper disable once InconsistentNaming - protected EasyUIControl EasyUIControlsUsed + private EasyUIControl EasyUIControlsUsed { get { return Master.EasyUIControlsUsed; } set { Master.EasyUIControlsUsed = value; } } - public IncludedControl IncludedControlsUsed + private IncludedControl IncludedControlsUsed { get { return Master.IncludedControlsUsed; } set { Master.IncludedControlsUsed = value; } diff --git a/Site5/Controls/v5/Base/ComboGeographies.ascx.cs b/Site5/Controls/v5/Base/ComboGeographies.ascx.cs index 61a9d88d..f4067335 100644 --- a/Site5/Controls/v5/Base/ComboGeographies.ascx.cs +++ b/Site5/Controls/v5/Base/ComboGeographies.ascx.cs @@ -25,6 +25,11 @@ namespace Swarmops.Controls.Base } } + protected void Page_Init (object sender, EventArgs e) + { + ((PageV5Base) this.Page).RegisterControl (EasyUIControl.Tree); + } + protected void Page_Load (object sender, EventArgs e) { RootGeography = Geography.Root; // set to "world" unless manually set to something else diff --git a/Site5/Controls/v5/Base/FileUpload.ascx.cs b/Site5/Controls/v5/Base/FileUpload.ascx.cs index 2c8aae2d..4771e429 100644 --- a/Site5/Controls/v5/Base/FileUpload.ascx.cs +++ b/Site5/Controls/v5/Base/FileUpload.ascx.cs @@ -36,6 +36,12 @@ namespace Swarmops.Controls.Base public string ClientUploadCompleteCallback { get; set; } public string ClientUploadStartedCallback { get; set; } + protected void Page_Init (object sender, EventArgs e) + { + // cause master to include necessary script + ((PageV5Base)Page).RegisterControl(IncludedControl.FileUpload); + } + protected void Page_Load (object sender, EventArgs e) { if (!Page.IsPostBack) @@ -64,9 +70,6 @@ namespace Swarmops.Controls.Base { this.GuidString = this.HiddenGuid.Value; } - - ((PageV5Base) Page).IncludedControlsUsed |= IncludedControl.FileUpload; - // causes master to include necessary script } diff --git a/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs b/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs index 6aa60a21..6a9ccd35 100644 --- a/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs +++ b/Site5/Controls/v5/Financial/ComboBudgets.ascx.cs @@ -36,6 +36,11 @@ namespace Swarmops.Controls.Financial } } + protected void Page_Init (object sender, EventArgs e) + { + ((PageV5Base) this.Page).RegisterControl (EasyUIControl.Tree); + } + protected void Page_Load (object sender, EventArgs e) { } diff --git a/Site5/Pages/v5/Admin/EditOrganization.aspx.cs b/Site5/Pages/v5/Admin/EditOrganization.aspx.cs index 623a5f17..27cb5fee 100644 --- a/Site5/Pages/v5/Admin/EditOrganization.aspx.cs +++ b/Site5/Pages/v5/Admin/EditOrganization.aspx.cs @@ -23,10 +23,8 @@ namespace Swarmops.Frontend.Pages.v5.Admin Localize(); } - - EasyUIControlsUsed = EasyUIControl.Tabs; - IncludedControlsUsed = IncludedControl.FileUpload | IncludedControl.SwitchButton | - IncludedControl.JsonParameters; + RegisterControl (EasyUIControl.Tabs); + RegisterControl (IncludedControl.SwitchButton); } private void Localize() diff --git a/Site5/Pages/v5/Admin/Settings.aspx.cs b/Site5/Pages/v5/Admin/Settings.aspx.cs index 997e99cd..1bc1a740 100644 --- a/Site5/Pages/v5/Admin/Settings.aspx.cs +++ b/Site5/Pages/v5/Admin/Settings.aspx.cs @@ -22,7 +22,6 @@ namespace Swarmops.Frontend.Pages.v5.Admin { // HACK: The organization part must be removed once proper access control is in place this.PageAccessRequired = new Access(this.CurrentOrganization, AccessAspect.System, AccessType.Write); - this.IncludedControlsUsed = IncludedControl.JsonParameters | IncludedControl.SwitchButton; this.PageTitle = Resources.Pages.Admin.SystemSettings_PageTitle; this.InfoBoxLiteral = Resources.Pages.Admin.SystemSettings_Info; @@ -39,6 +38,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin } RegisterControl (EasyUIControl.Tabs); + RegisterControl (IncludedControl.JsonParameters | IncludedControl.SwitchButton); } private static string FormatSmtpAccessString (string user, string pass, string host, int port) diff --git a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs index 269f5bd7..d7e99365 100644 --- a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs +++ b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs @@ -23,8 +23,6 @@ namespace Swarmops.Frontend.Pages.Comms this.TextMessage.Style[HtmlTextWriterStyle.Width] = "674px"; this.TextMessage.Style["resize"] = "none"; - - EasyUIControlsUsed = EasyUIControl.Tree; } private void Localize() diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs index 890a6136..b1d4998d 100644 --- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs @@ -38,7 +38,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial PopulateExpenses(); // PopulateSalaries(); - EasyUIControlsUsed = EasyUIControl.DataGrid; + RegisterControl(EasyUIControl.DataGrid); this.RepeaterLightboxItems.DataSource = this._documentList; this.RepeaterLightboxItems.DataBind(); diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs index e7fbd090..c3017957 100644 --- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs +++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs @@ -102,10 +102,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial Localize(); } - - EasyUIControlsUsed = EasyUIControl.Tree; - IncludedControlsUsed = IncludedControl.JsonParameters; - ; } diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs index e52e0954..2dbab8e7 100644 --- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs +++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs @@ -109,9 +109,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial Localize(); } - - EasyUIControlsUsed = EasyUIControl.Tree; - IncludedControlsUsed = IncludedControl.FileUpload | IncludedControl.JsonParameters; } diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs index d32d4542..ea008178 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -26,7 +26,7 @@ namespace Swarmops.Frontend.Pages.Financial Localize(); } - EasyUIControlsUsed = EasyUIControl.DataGrid; + RegisterControl (EasyUIControl.DataGrid); } private void Localize() diff --git a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs index f1890847..90d9e62d 100644 --- a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs +++ b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs @@ -31,9 +31,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial Localize(); } - - EasyUIControlsUsed = EasyUIControl.Tree; - IncludedControlsUsed = IncludedControl.JsonParameters; } diff --git a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs index 31f16016..a4633d6a 100644 --- a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs +++ b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs @@ -38,7 +38,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial this._documentList = new List(); PopulateExpenses(); - EasyUIControlsUsed = EasyUIControl.DataGrid; + RegisterControl (EasyUIControl.DataGrid); this.RepeaterLightboxItems.DataSource = this._documentList; diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs index d50fce14..778d1504 100644 --- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs +++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs @@ -97,8 +97,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Write); DbVersionRequired = 2; // Account reparenting - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; - IncludedControlsUsed |= IncludedControl.SwitchButton | IncludedControl.JsonParameters; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); + RegisterControl (IncludedControl.SwitchButton); } diff --git a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs index 9ec5ae5a..15f6f2be 100644 --- a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs +++ b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs @@ -31,7 +31,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Localize(); } - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); } diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs index c7a04039..cbbba8f3 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs @@ -51,7 +51,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers this.DropMonths.SelectedValue = today.Month.ToString (CultureInfo.InvariantCulture); } - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); Localize(); } diff --git a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs index e89484eb..d31133ee 100644 --- a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs @@ -30,7 +30,7 @@ public partial class Pages_v5_Ledgers_ProfitLossStatement : PageV5Base Localize(); } - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); } private void Localize() diff --git a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs index 285547a3..58d8fd2d 100644 --- a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs @@ -75,7 +75,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Localize(); } - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); } diff --git a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs index 309067bb..b5f8f2e8 100644 --- a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs +++ b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs @@ -27,7 +27,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers.TaxForms Localize(); } - EasyUIControlsUsed = EasyUIControl.DataGrid | EasyUIControl.Tree; + RegisterControl (EasyUIControl.DataGrid | EasyUIControl.Tree); } diff --git a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs index d2545f00..143d2543 100644 --- a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs @@ -42,7 +42,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Localize(); } } - EasyUIControlsUsed = EasyUIControl.DataGrid; + RegisterControl (EasyUIControl.DataGrid); } private void Localize() diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs index f0b2462a..f394e44a 100644 --- a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs +++ b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs @@ -38,8 +38,6 @@ namespace Swarmops.Frontend.Pages.v5.Swarm this.TextName.Focus(); } - - IncludedControlsUsed = IncludedControl.JsonParameters; } private void Populate() diff --git a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs index dbce8137..555aec4c 100644 --- a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs +++ b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs @@ -22,7 +22,7 @@ namespace Swarmops.Frontend.Pages.Swarm Localize(); } - EasyUIControlsUsed = EasyUIControl.Tree | EasyUIControl.DataGrid; + RegisterControl (EasyUIControl.Tree | EasyUIControl.DataGrid); } private void Localize()