diff --git a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip index 07beffb..16a8f63 100644 Binary files a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 59bc184..feae14f 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index e1e6f17..ce51953 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll index ddc58ae..feae14f 100644 Binary files a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll and b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 97bdc67..77e9a04 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -104,7 +104,7 @@ - + @@ -115,6 +115,7 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx index a1ca745..9596ad3 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx @@ -32,7 +32,7 @@
- +
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs index c9bf472..7532493 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs @@ -26,6 +26,7 @@ public partial class mod_dettMtzProg : System.Web.UI.UserControl private void traduciObj() { + lblTxtCerca.Text = traduci("lblTxtCerca"); lblInsNewIntPro.Text = traduci("lblInsNewIntPro"); lblDescrMtzPro.Text = traduci("lblDescrMtzPro"); lblInizioMtzPro.Text = traduci("lblInizioMtzPro"); diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs index 9c712b3..d7ecda5 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs @@ -121,9 +121,13 @@ public partial class mod_elFamMacch : ApplicationUserControl if (answ) { answ = false; - if (TA_app.obj.taMacc2Fam.getByFam(Convert.ToInt32(idx)).Rows.Count == 0) + // controllo SOLO se è permessa cancellazione globale... + if (memLayer.ML.confReadBool("allowDelete")) { - answ = true; + if (TA_app.obj.taMacc2Fam.getByFam(Convert.ToInt32(idx)).Rows.Count == 0) + { + answ = true; + } } } return answ; diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx index f3480d1..354e702 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx @@ -8,13 +8,13 @@
-
- +
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 59bc184..feae14f 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index e44faaf..696b59f 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index e1e6f17..ce51953 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll index 9eecaee..696b59f 100644 Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ