From 7d744befe1520382e819ec09defe68456e634f8a Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 3 Oct 2013 11:41:52 +0000 Subject: [PATCH] Attempt at bugfix, running mobile and blind --- Logic/Support/Documents.cs | 4 ++-- Site5/Controls/v5/Base/FileUpload.ascx | 3 ++- Site5/Controls/v5/Base/FileUpload.ascx.cs | 9 +++++++-- Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Logic/Support/Documents.cs b/Logic/Support/Documents.cs index fc039b28..2b4bf78a 100644 --- a/Logic/Support/Documents.cs +++ b/Logic/Support/Documents.cs @@ -59,9 +59,9 @@ namespace Swarmops.Logic.Support } - public static Documents RecentFromGuid (Guid guid) + public static Documents RecentFromDescription (string description) { - return FromArray (SwarmDb.GetDatabaseForReading().GetDocumentsRecentByDescription (guid.ToString())); + return FromArray (SwarmDb.GetDatabaseForReading().GetDocumentsRecentByDescription (description)); } diff --git a/Site5/Controls/v5/Base/FileUpload.ascx b/Site5/Controls/v5/Base/FileUpload.ascx index 5396de3c..a51f2de3 100644 --- a/Site5/Controls/v5/Base/FileUpload.ascx +++ b/Site5/Controls/v5/Base/FileUpload.ascx @@ -13,7 +13,7 @@ $(document).ready(function() { $('#ButtonUploadHidden').fileupload({ - url: '/Automation/UploadFileHandler.ashx?Guid=<%= Guid.ToString() %>', + url: '/Automation/UploadFileHandler.ashx?Guid=<%= GuidString %>', dataType: 'json', done: function(e, data) { $.each(data.result, function(index, file) { @@ -54,6 +54,7 @@ }); +
 
diff --git a/Site5/Controls/v5/Base/FileUpload.ascx.cs b/Site5/Controls/v5/Base/FileUpload.ascx.cs index b164649e..011cf332 100644 --- a/Site5/Controls/v5/Base/FileUpload.ascx.cs +++ b/Site5/Controls/v5/Base/FileUpload.ascx.cs @@ -14,16 +14,21 @@ namespace Swarmops.Controls.Base { if (!Page.IsPostBack) { - Guid = Guid.NewGuid(); + Guid newGuid = Guid.NewGuid(); + this.HiddenGuid.Value = GuidString = newGuid.ToString(); if (Filter == UploadFilter.Unknown) // if not set in control { Filter = UploadFilter.NoFilter; } } + else + { + GuidString = this.HiddenGuid.Value; + } } - public Guid Guid; + public string GuidString; public UploadFilter Filter; diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs index 9e007af1..4179e982 100644 --- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs +++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs @@ -97,7 +97,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial // Get documents; check that documents have been uploaded - Documents documents = Documents.RecentFromGuid (this.FileUpload.Guid); + Documents documents = Documents.RecentFromDescription (this.FileUpload.GuidString); if (documents.Count == 0) {