diff --git a/Jenkinsfile b/Jenkinsfile
index 536201ee..615b6ed3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1351']) {
+ withEnv(['NEXT_BUILD_NUMBER=1352']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-MAG/Resources/DefaultMenu.xml b/MP-MAG/Resources/DefaultMenu.xml
index 1be8da88..0f6d6c5c 100644
--- a/MP-MAG/Resources/DefaultMenu.xml
+++ b/MP-MAG/Resources/DefaultMenu.xml
@@ -1,39 +1,6 @@
-
-
-
\ No newline at end of file
diff --git a/MP-MAG/WebUserControls/cmp_footer.ascx.cs b/MP-MAG/WebUserControls/cmp_footer.ascx.cs
index 6c8d05c8..77eb2fac 100644
--- a/MP-MAG/WebUserControls/cmp_footer.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_footer.ascx.cs
@@ -19,8 +19,14 @@ namespace MP_MAG.WebUserControls
private void setClock()
{
lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
- lblCodOperatore.Text = $"{user_std.UtSn.CognomeNomeMatr}";
- //lblCodOperatore.Text = $"{Page.User.Identity.Name}";
+ if (user_std.UtSn.isAuth)
+ {
+ lblCodOperatore.Text = $"{user_std.UtSn.CognomeNomeMatr}";
+ }
+ else
+ {
+ lblCodOperatore.Text = "N.D.";
+ }
}
///
diff --git a/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs b/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs
index c38cc2cb..4d5af260 100644
--- a/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs
@@ -112,14 +112,14 @@ namespace MP_MAG.WebUserControls
{
Response.Redirect("login", true);
}
- XmlMenu.Data = File.ReadAllText(Server.MapPath("/Resources/DefaultMenu.xml"));
+ string DefaultMenuPath = Server.MapPath("~/Resources/DefaultMenu.xml");
+ logger.lg.scriviLog($"Manca menu utente --> leggo default da {DefaultMenuPath}");
+ XmlMenu.Data = File.ReadAllText(DefaultMenuPath);
}
else
{
XmlMenu.Data = devicesAuthProxy.stObj.mappaSito;
}
- XmlMenu.XPath = "mainMenu/menu";
- XmlMenu.DataBind();
}
catch (Exception exc)
{
@@ -127,7 +127,10 @@ namespace MP_MAG.WebUserControls
{
Response.Redirect("login", false);
}
+ XmlMenu.Data = "