Attempt at bugfix, running mobile and blind
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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 @@
|
||||
});
|
||||
|
||||
</script>
|
||||
<asp:HiddenField runat="server" ID="HiddenGuid"/>
|
||||
|
||||
<div style="height:36px;float:left"><input id="ButtonUploadVisible" class="ButtonSwarmopsUpload" type="button" /><input id="ButtonUploadHidden" type="file" name="files[]" multiple style="display:none" /></div><div style="height:36px;width:270px;margin-right:10px;float:right;border:none"><div id="DivUploadCount" style="display:none;overflow:hidden;height:64px"></div><div id="DivProgressUpload" style="width:100%;margin-top:8px;display:none"></div></div> <br/>
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user