diff --git a/Jenkinsfile b/Jenkinsfile index db3a690..864773f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}') diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index e2f7bc7..8232039 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -36,9 +36,8 @@ - + - diff --git a/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs b/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs index 541bd38..7d85321 100644 --- a/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs @@ -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); } } /// diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs index ac713ca..da5b34a 100644 --- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs @@ -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"); + } + } + /// /// imposta visibilità search globale /// @@ -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); } } ///