diff --git a/Site/Pages/v5/Ledgers/InspectLedgers.aspx b/Site/Pages/v5/Ledgers/InspectLedgers.aspx index 182a0ddb..eea6b8e8 100644 --- a/Site/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site/Pages/v5/Ledgers/InspectLedgers.aspx @@ -58,14 +58,17 @@ // Dynamic reloading screws up resizing for some reason, so we'll have to resize the tx grid manually. var heightBody = $('div#<%=this.DialogEditTx.ClientID%>_divModalCover table.datagrid-btable').height(); - $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-body').height(heightBody); - var heightHeaders = $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-header').height(); - $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-view').height(heightBody + heightHeaders + 20); // +20 adds some margin on the bottom. It's an arbitrary number. - $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-wrap').height(heightBody + heightHeaders + 20); + if (heightBody != null) + { + $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-body').height(heightBody); - $('div#<%=this.DialogEditTx.ClientID%>_divModalBox').height($('div#<%=this.DialogEditTx.ClientID%>_divModalBox div.content').height() + 20); + var heightHeaders = $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-header').height(); + $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-view').height(heightBody + heightHeaders + 20); // +20 adds some margin on the bottom. It's an arbitrary number. + $('div#<%=this.DialogEditTx.ClientID%>_divModalCover div.datagrid-wrap').height(heightBody + heightHeaders + 20); + $('div#<%=this.DialogEditTx.ClientID%>_divModalBox').height($('div#<%=this.DialogEditTx.ClientID%>_divModalBox div.content').height() + 20); + } } }); @@ -188,7 +191,7 @@ function onInspectTransaction(transactionId) { window.scrollTo(0, 0); $('body').css('overflow-y', 'hidden'); - $('#<%=this.DialogEditTx.ClientID%>_divModalCover').fadeIn(); + <%=this.DialogEditTx.ClientID%>_open(); SwarmopsJS.formatInteger(transactionId, function(result) { $('span#spanModalTransactionId').text(result); }); $('#gridTransaction').datagrid({ url: 'Json-InspectLedgerTxData.aspx?TxId=' + transactionId }); diff --git a/Site/Pages/v5/Ledgers/InspectLedgers.aspx.cs b/Site/Pages/v5/Ledgers/InspectLedgers.aspx.cs index 70628e93..406c1f14 100644 --- a/Site/Pages/v5/Ledgers/InspectLedgers.aspx.cs +++ b/Site/Pages/v5/Ledgers/InspectLedgers.aspx.cs @@ -449,12 +449,6 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } } - /// - /// DropBudgets control. - /// - /// - /// Auto-generated field. Moved from designer file to code-behind file. - /// - protected Swarmops.Controls.Financial.ComboBudgets DropBudgets; + } } \ No newline at end of file diff --git a/Site/Pages/v5/Ledgers/InspectLedgers.aspx.designer.cs b/Site/Pages/v5/Ledgers/InspectLedgers.aspx.designer.cs index 9680dd75..97f15043 100644 --- a/Site/Pages/v5/Ledgers/InspectLedgers.aspx.designer.cs +++ b/Site/Pages/v5/Ledgers/InspectLedgers.aspx.designer.cs @@ -84,7 +84,15 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { /// protected global::System.Web.UI.WebControls.Label LabelHeaderInspect; - + /// + /// DropBudgets control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Controls.Financial.ComboBudgets DropBudgets; + /// /// LabelHeaderInspectFor control. ///