diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index be73174..b9a81da 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index be793db..c34ece3 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index be73174..b9a81da 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS_SC/Bootstrap.Master b/CMS_SC/Bootstrap.Master index 70fc567..0a889b6 100644 --- a/CMS_SC/Bootstrap.Master +++ b/CMS_SC/Bootstrap.Master @@ -28,7 +28,8 @@
- <%--EnablePartialRendering="false"--%> + + <%--EnablePartialRendering="false"--%> <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%> <%--Framework Scripts--%> @@ -103,7 +104,7 @@
- +    
diff --git a/CMS_SC/BootstrapNoUpdPnl.Master b/CMS_SC/BootstrapNoUpdPnl.Master index 71b15de..c24e6df 100644 --- a/CMS_SC/BootstrapNoUpdPnl.Master +++ b/CMS_SC/BootstrapNoUpdPnl.Master @@ -93,7 +93,7 @@
- +    
diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index d1e9c80..f65b637 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -32,6 +32,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index 889b8fd..580b254 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -120,7 +120,7 @@ - + diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs index 74778eb..7571a69 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs @@ -114,9 +114,26 @@ namespace CMS_SC.WebUserControls { get { - bool answ = true; - - return answ; + return (userIsCapoOfficina || userIsCapoGruppo); + } + } + /// + /// verifica se utente sia SuperUser + /// + public bool userIsCapoOfficina + { + get + { + return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoOfficinaRole")); + } + } /// + /// verifica se utente sia SuperUser + /// + public bool userIsCapoGruppo + { + get + { + return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoGruppo")); } } /// diff --git a/CMS_SC/WebUserControls/mod_testata.ascx.cs b/CMS_SC/WebUserControls/mod_testata.ascx.cs index 04590ef..3b6a286 100644 --- a/CMS_SC/WebUserControls/mod_testata.ascx.cs +++ b/CMS_SC/WebUserControls/mod_testata.ascx.cs @@ -433,6 +433,15 @@ namespace CMS_SC.WebUserControls { return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoOfficinaRole")); } + } /// + /// verifica se utente sia SuperUser + /// + public bool userIsCapoGruppo + { + get + { + return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoGruppo")); + } } /// /// verifica se utente sia SuperUser diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index be73174..b9a81da 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 17f30be..7665247 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll.config b/CMS_SC/bin/CMS_SC.dll.config index d1e9c80..f65b637 100644 --- a/CMS_SC/bin/CMS_SC.dll.config +++ b/CMS_SC/bin/CMS_SC.dll.config @@ -32,6 +32,7 @@ + diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index be793db..c34ece3 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ