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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-17 19:49:57 +02:00
parent 2499bfc365 2cf1fe9f13
commit 356d8e17ff
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=335']) {
withEnv(['NEXT_BUILD_NUMBER=336']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Web.config
+1 -2
View File
@@ -36,9 +36,8 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<!--Nascondo gli erroracci-->
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
<customErrors mode="On" defaultRedirect="~/site/Default"/>
<!--<customErrors mode="On" defaultRedirect="~/"/>-->
<customErrors mode="On" defaultRedirect="~/site/ErrorsLog"/>
<!--Mostro gli erroracci-->
<!--<customErrors mode="Off"/>-->
</system.web>
NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs
+8 -5
View File
@@ -22,15 +22,18 @@ namespace NKC_WF.WebUserControls
{
if (string.IsNullOrEmpty(user_std.UtSn.mappaSito))
{
Response.Redirect("Default", false);
Response.Redirect("Default", true);
}
else
{
XmlMenu.Data = user_std.UtSn.mappaSito;
XmlMenu.XPath = "mainMenu/menu";
XmlMenu.DataBind();
}
XmlMenu.Data = user_std.UtSn.mappaSito;
XmlMenu.XPath = "mainMenu/menu";
XmlMenu.DataBind();
}
catch
{
Response.Redirect("Default", false);
Response.Redirect("Default", true);
}
}
/// <summary>
NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
+12 -2
View File
@@ -12,11 +12,21 @@ namespace NKC_WF.WebUserControls
{
if (!Page.IsPostBack)
{
checkAuth();
searchVal = "";
doSearch();
updateTreeMenu();
}
}
private void checkAuth()
{
if (!Page.User.Identity.IsAuthenticated)
{
Response.Redirect("default");
}
}
/// <summary>
/// imposta visibilità search globale
/// </summary>
@@ -78,7 +88,7 @@ namespace NKC_WF.WebUserControls
{
if (string.IsNullOrEmpty(user_std.UtSn.mappaSito))
{
Response.Redirect("Default", false);
Response.Redirect("Default", true);
}
XmlMenu.Data = user_std.UtSn.mappaSito;
XmlMenu.XPath = "mainMenu/menu";
@@ -86,7 +96,7 @@ namespace NKC_WF.WebUserControls
}
catch
{
Response.Redirect("Default", false);
Response.Redirect("default", true);
}
}
/// <summary>