Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Review procedura login senza cookie x IIS01/IIS02

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-12-31 12:18:27 +01:00
parent ce3d21f84e
commit 3ddc7fddc5
4 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
MP-MAG/Resources/DefaultMenu.xml
-33
View File
@@ -1,39 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<mainMenu>
<!--<menu title="Planner Functions" description="fa fa-cloud-upload shortcut-icon" url="~/menu">
<voce title="Part Validation" description="fa fa-check-circle shortcut-icon" url="~/PartValidation" />
<voce title="Order CSV Man" description="fa fa-file-text-o shortcut-icon" url="~/OrderManager" />
<voce title="Order Scheduler" description="fa fa-list-ol shortcut-icon" url="~/OrderScheduler" />
<voce title="Order History" description="fa fa-history shortcut-icon" url="~/OrderHistory" />
<voce title="KIT CSV Man" description="fa fa-file-text-o shortcut-icon" url="~/KitRequestImporter" />
<voce title="KIT Scheduler" description="fa fa-list-ol shortcut-icon" url="~/KitRequestSched" />
</menu>-->
<!--<menu title="Work Places" description="fa fa-industry shortcut-icon" url="~/menu">
<voce title="BUNK Manager" description="fa fa-list shortcut-icon" url="~/StackManager" />
<voce title="Machine Load" description="fa fa-upload shortcut-icon" url="~/MachineLoad" />
<voce title="Load Smart" description="fa fa-mobile shortcut-icon" url="~/MachineLoadSmart" />
<voce title="Machine Unload" description="fa fa-download shortcut-icon" url="~/MachineUnload" />
<voce title="Unload SMART" description="fa fa-mobile shortcut-icon" url="~/MachineUnloadSmart" />
<voce title="Machine Offline" description="fa fa-wrench shortcut-icon" url="~/MachineOffline" />
<voce title="Painting" description="fa fa-paint-brush shortcut-icon" url="~/Painting" />
<voce title="Painting Smart" description="fa fa-mobile shortcut-icon" url="~/PaintingSmart" />
<voce title="Kitting" description="fa fa-object-group shortcut-icon" url="~/Kitting" />
<voce title="Kitting Smart" description="fa fa-mobile shortcut-icon" url="~/KittingSmart" />
<voce title="Adv Kitting OP" description="fa fa-mobile shortcut-icon" url="~/KittingSmartAdv" />
</menu>-->
<menu title="Utility" description="fa fa-briefcase shortcut-icon" url="~/menu">
<voce title="Enroll Device" description="fas fa-sign-in-alt shortcut-icon" url="~/EnrollDevice" />
<!--<voce title="2nd Screen Page" description="fa fa-desktop shortcut-icon" url="~/SecondScreen" />
<voce title="Global Search" description="fa fa-binoculars shortcut-icon" url="~/GlobalSearch" />
<voce title="Labels Print" description="fa fa-print shortcut-icon" url="~/LabelsPrint" />
<voce title="Other PARTS" description="fa fa-tags shortcut-icon" url="~/OtherItems" />
<voce title="Part Missing" description="fa fa-lock shortcut-icon" url="~/PartMIA" />
<voce title="DXF file Validation" description="fa fa-check-square-o shortcut-icon" url="~/DxfValidation" />-->
</menu>
<!--<menu title="Admin Area" description="fa fa-lock shortcut-icon" url="~/menu">
<voce title="Translation" description="fa fa-language shortcut-icon" url="~/vocabolario" />
<voce title="Reload" description="fa fa-retweet shortcut-icon" url="~/UpdateVoc" />
<voce title="Dev UTILS" description="fa fa-wrench shortcut-icon" url="~/DevUtils" />
<voce title="Update Manager" description="fa fa-unlock-alt shortcut-icon" url="~/UpdMan" />
</menu>-->
</mainMenu>
MP-MAG/WebUserControls/cmp_footer.ascx.cs
+8 -2
View File
@@ -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.";
}
}
/// <summary>
MP-MAG/WebUserControls/cmp_menuTop.ascx.cs
+6 -3
View File
@@ -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 = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><mainMenu><menu title=\"Utility\" description=\"fa fa-briefcase shortcut-icon\" url=\"~/menu\"><voce title=\"Enroll Device\" description=\"fas fa-sign-in-alt shortcut-icon\" url= \"~/EnrollDevice\" /></ menu></ mainMenu>";
}
XmlMenu.XPath = "mainMenu/menu";
XmlMenu.DataBind();
}
#endregion Private Methods