diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx index 0c3ca3d..8818f5f 100644 --- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx +++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_menuTopCompact" %>
- Task + Commesse
@@ -12,13 +12,13 @@
-
+
<%: NomeOpr %>
-
+
<%: CurrNumTask %>
-
+
<%: DescPost %>
diff --git a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs index ec70240..8ba1478 100644 --- a/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs +++ b/C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs @@ -13,13 +13,14 @@ namespace C_TRACK.WebUserControls string lastPage = Request.Url.LocalPath.Split('/').Last(); if (!Page.IsPostBack) { + // fix visibilità TASK + hlTask.Visible = devicesAuthProxy.stObj.userHasRight("CT_userStart"); // se l'utente NON c'è torno a login... if (!devicesAuthProxy.stObj.isAuth) { if (lastPage != "" && lastPage != "login") { - Session["nextPage"] = lastPage; - //} + Session["nextPage"] = lastPage; } // SE non sono in "safe page" if (memLayer.ML.CRS("_loginPages").IndexOf(lastPage) < 0) diff --git a/Jenkinsfile b/Jenkinsfile index f7e712f..def8f5a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=59']) { + withEnv(['NEXT_BUILD_NUMBER=60']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK'