Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix master e login x errori

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-18 09:46:49 +02:00
parent 40ee85774c
commit 18ce547bb2
5 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/NKC_WF.csproj
+16 -8
View File
@@ -288,6 +288,7 @@
<Content Include="Core\Compression\Snappy\lib\win\snappy64.dll" />
<Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
<Content Include="Default.aspx" />
<Content Include="ErrorPages\404.aspx" />
<Content Include="ErrorPages\Oops.aspx" />
<Content Include="export\BunkDetail.aspx" />
<Content Include="Home.aspx" />
@@ -405,7 +406,6 @@
</Content>
<Content Include="site\DBG_QRCode_Unload.aspx" />
<Content Include="site\DevUtils.aspx" />
<Content Include="site\ErrorPage.aspx" />
<Content Include="site\ErrorsLog.aspx" />
<Content Include="site\ForceReload.aspx" />
<Content Include="site\GlobalSearch.aspx" />
@@ -442,6 +442,7 @@
<Content Include="WebUserControls\cmp_BP_bunkList.ascx" />
<Content Include="WebUserControls\cmp_BP_sheetList.ascx" />
<Content Include="WebUserControls\cmp_devUtils.ascx" />
<Content Include="WebUserControls\cmp_errorDetail.ascx" />
<Content Include="WebUserControls\cmp_ErrorsLog.ascx" />
<Content Include="WebUserControls\cmp_fileUpload.ascx" />
<Content Include="WebUserControls\cmp_home.ascx" />
@@ -654,6 +655,13 @@
<Compile Include="Empty.Master.designer.cs">
<DependentUpon>Empty.Master</DependentUpon>
</Compile>
<Compile Include="ErrorPages\404.aspx.cs">
<DependentUpon>404.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ErrorPages\404.aspx.designer.cs">
<DependentUpon>404.aspx</DependentUpon>
</Compile>
<Compile Include="ErrorPages\Oops.aspx.cs">
<DependentUpon>Oops.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -731,13 +739,6 @@
<Compile Include="site\DevUtils.aspx.designer.cs">
<DependentUpon>DevUtils.aspx</DependentUpon>
</Compile>
<Compile Include="site\ErrorPage.aspx.cs">
<DependentUpon>ErrorPage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\ErrorPage.aspx.designer.cs">
<DependentUpon>ErrorPage.aspx</DependentUpon>
</Compile>
<Compile Include="site\ErrorsLog.aspx.cs">
<DependentUpon>ErrorsLog.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1008,6 +1009,13 @@
<Compile Include="WebUserControls\cmp_devUtils.ascx.designer.cs">
<DependentUpon>cmp_devUtils.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_errorDetail.ascx.cs">
<DependentUpon>cmp_errorDetail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_errorDetail.ascx.designer.cs">
<DependentUpon>cmp_errorDetail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ErrorsLog.ascx.cs">
<DependentUpon>cmp_ErrorsLog.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Site.Master.cs
+15 -1
View File
@@ -15,7 +15,7 @@ namespace NKC_WF
// faccio refresh pagina...
}
/// <summary>
/// Imposta vilibilità componente search globale
/// Imposta visibilità componente search globale
/// </summary>
public bool showSearch
{
@@ -28,5 +28,19 @@ namespace NKC_WF
cmp_menuTop.showSearch = value;
}
}
/// <summary>
/// Imposta abilitazione anonymous (senza fare auth)
/// </summary>
public bool enableAnonym
{
get
{
return cmp_menuTop.enableAnonym;
}
set
{
cmp_menuTop.enableAnonym = value;
}
}
}
}
NKC_WF/SiteContent.master.cs
+15 -1
View File
@@ -9,7 +9,7 @@ namespace NKC_WF
}
/// <summary>
/// Imposta vilibilità componente search globale
/// Imposta visibilità componente search globale
/// </summary>
public bool showSearch
{
@@ -22,5 +22,19 @@ namespace NKC_WF
((SiteMaster)Master).showSearch = value;
}
}
/// <summary>
/// Imposta abilitazione anonymous (senza fare auth)
/// </summary>
public bool enableAnonym
{
get
{
return ((SiteMaster)Master).enableAnonym;
}
set
{
((SiteMaster)Master).enableAnonym = value;
}
}
}
}
NKC_WF/Web.config
+4 -2
View File
@@ -38,9 +38,11 @@
<!--Nascondo gli erroracci-->
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
<!--<customErrors mode="On" defaultRedirect="~/"/>-->
<!--<customErrors mode="On" defaultRedirect="~/site/ErrorsLog"/>-->
<customErrors mode="RemoteOnly" defaultRedirect="~/ErrorPages/Oops.aspx">
<error statusCode="404" redirect="~/ErrorPages/404.aspx"/>
</customErrors>
<!--Mostro gli erroracci-->
<customErrors mode="Off"/>
<!--<customErrors mode="Off"/>-->
</system.web>
<appSettings>
<!--Configurazioni generali-->
NKC_WF/site/Login.aspx.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace NKC_WF
private void Cmp_login_Login_Error(object sender, EventArgs e)
{
Response.Redirect("ErrorPage?LastError=LoginError");
Response.Redirect("~/ErrorPages/Oops?aspxerrorpath=Login");
}
private void Cmp_login_Login_ok(object sender, EventArgs e)