Merge branch 'release/FixReloadAfterNewProj'

This commit is contained in:
Samuele Locatelli
2022-05-05 17:27:30 +02:00
5 changed files with 9 additions and 14 deletions
-1
View File
@@ -69,7 +69,6 @@
</div>
<div class="px-2">
<asp:Label runat="server" ID="lblAuthKey" Font-Size="0.6em" />
<asp:Label runat="server" ID="Label1" />
</div>
</div>
</div>
-9
View File
@@ -94,14 +94,5 @@ namespace GPW_Admin
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblAuthKey;
/// <summary>
/// Label1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
}
}
@@ -9,12 +9,12 @@
<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<div class="row table-secondary mb-1">
<div class="col-4">
<div class="d-flex table-secondary small mb-1">
<div class="px-0">
<asp:LinkButton runat="server" ID="lbtForceUpdate" CssClass="btn btn-success" OnClick="lbtForceUpdate_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Forza Update</asp:LinkButton>
</div>
<div class="col-8 input-group input-group-sm small">
<div class="d-flex flex-row-reverse input-group-text py-0">
<div class="px-0 flex-grow-1">
<div class="d-flex flex-row-reverse table-secondary py-1 px-0">
<div class="px-2">
<asp:LinkButton runat="server" ID="lbtResetFilt" ToolTip="Reset Filtro" OnClick="lbtResetFilt_Click" CssClass="btn btn-sm btn-block btn-outline-secondary"><i class="fa fa-refresh" aria-hidden="true"></i> Reset Filt</asp:LinkButton>
</div>
@@ -462,6 +462,10 @@ namespace GPW_Admin.WebUserControls
{
// click su inserimento, chiamo il metodo insert dell'ObjectDataSource
ods.Insert();
// tolgo veto x refresh...
string vetoHash = memLayer.ML.redHash($"VetoProjRefresh");
memLayer.ML.setRSV(vetoHash,"");
checkRefresh();
}
/// <summary>
@@ -322,6 +322,7 @@ public partial class mod_filtro : ApplicationUserControl
set
{
_valore = value;
traduciObj();
}
}