diff --git a/GMW/WebUserControls/mod_testata.ascx b/GMW/WebUserControls/mod_testata.ascx
index 415c957d..16ed7b9f 100644
--- a/GMW/WebUserControls/mod_testata.ascx
+++ b/GMW/WebUserControls/mod_testata.ascx
@@ -29,7 +29,7 @@
diff --git a/GMW/WebUserControls/mod_testata.ascx.cs b/GMW/WebUserControls/mod_testata.ascx.cs
index 7e50b99c..d585241c 100644
--- a/GMW/WebUserControls/mod_testata.ascx.cs
+++ b/GMW/WebUserControls/mod_testata.ascx.cs
@@ -24,7 +24,6 @@ namespace GMW.WebUserControls
// se l'utente c'รจ...
if (user_std.UtSn.isAuth)
{
- //forzaUpdateMenu();
updateTreeMenu();
}
}
@@ -40,9 +39,6 @@ namespace GMW.WebUserControls
lblTitolo.Text = traduci(riga.NOME);
lblIconTitolo.CssClass = traduci(riga.DESCRIZIONE);
lbnUpdate.ToolTip = traduci("Update");
-#if false
- lnkPagCorr.HRef = string.Format("~/{0}", user_std.pagCorrente);
-#endif
}
catch
{
@@ -65,9 +61,14 @@ namespace GMW.WebUserControls
{
try
{
- XmlDataSource1.Data = user_std.UtSn.mappaSito;
- XmlDataSource1.XPath = "mainMenu/menu";
- XmlDataSource1.DataBind();
+ if (user_std.UtSn.mappaSito == "")
+ {
+ Response.Redirect("default.aspx");
+ }
+
+ XmlMenu.Data = user_std.UtSn.mappaSito;
+ XmlMenu.XPath = "mainMenu/menu";
+ XmlMenu.DataBind();
}
catch
{
@@ -99,18 +100,18 @@ namespace GMW.WebUserControls
protected void PagCorrente()
{
string[] uri = Request.Url.LocalPath.Split('/');
- // salvo pagian corrente
- user_std.pagCorrente = uri.Last().Replace("/","");
+ // salvo pagina corrente
+ user_std.pagCorrente = uri.Last();
if (user_std.pagPrecedente == "")
{
user_std.pagPrecedente = user_std.pagCorrente;
- memLayer.ML.setSessionVal("user_std.pagPrecedente", user_std.pagPrecedente);
}
+#if false
if (user_std.pagCorrente != user_std.pagPrecedente)
{
user_std.pagPrecedente = user_std.pagCorrente;
- memLayer.ML.setSessionVal("user_std.pagPrecedente", user_std.pagPrecedente);
- }
+ }
+#endif
}
///
/// effettua un update completo dei valori in sessione
diff --git a/GMW/WebUserControls/mod_testata.ascx.designer.cs b/GMW/WebUserControls/mod_testata.ascx.designer.cs
index fc284f89..c6ac3ad2 100644
--- a/GMW/WebUserControls/mod_testata.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_testata.ascx.designer.cs
@@ -85,12 +85,12 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.Repeater menu;
///
- /// XmlDataSource1 control.
+ /// XmlMenu control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1;
+ protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
}
}
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index c5f3f0a6..231946b1 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index d5f9cb90..1354f939 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index 855c40e8..b4c22ab9 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index 2415cff9..fe9f7135 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ