Egalware/SSC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possibilità deroga misure collaudo a utenti abilitati

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-10-29 17:06:56 +01:00
parent 84c1e17898
commit ac1a33cf9a
13 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/Bootstrap.Master
+3 -2
View File
@@ -28,7 +28,8 @@
</head>
<body>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server"> <%--EnablePartialRendering="false"--%>
<asp:ScriptManager ID="ScriptManager1" runat="server">
<%--EnablePartialRendering="false"--%>
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
@@ -103,7 +104,7 @@
<div id="progress_back">
</div>
<div id="progress_top">
<asp:Image ID="ProgressBar" ImageUrl="~/images/loader.gif" runat="server" />
<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;
</div>
</ProgressTemplate>
</asp:UpdateProgress>
CMS_SC/BootstrapNoUpdPnl.Master
+1 -1
View File
@@ -93,7 +93,7 @@
<div id="progress_back">
</div>
<div id="progress_top">
<asp:Image ID="ProgressBar" ImageUrl="~/images/loader.gif" runat="server" />
<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;
</div>
</ProgressTemplate>
</asp:UpdateProgress>
CMS_SC/Web.config
+1
View File
@@ -32,6 +32,7 @@
<add key="autoEnrollEnabled" value="false" />
<add key="SuperAdminRole" value="SuperAdmin" />
<add key="CapoOfficinaRole" value="CapoOfficina" />
<add key="CapoGruppo" value="CapoOfficina" />
<add key="AnagAdminRole" value="CqSetSC" />
<!--gestione auth dispositivi-->
<add key="AuthCookieName" value="AuthDeviceCMS_SC" />
CMS_SC/WebUserControls/mod_collaudi.ascx
+1 -1
View File
@@ -120,7 +120,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getDataFilt" TypeName="CMS_SC_Data.DS_ApplicazioneTableAdapters.MisureTableAdapter" FilterExpression=" CodSchedaVersNum LIKE '%{0}%' OR CodMisura LIKE '%{0}%' OR NomeMisura LIKE '%{0}%' OR NomePar LIKE '%{0}%' OR CodDeroga LIKE '%{0}%' " UpdateMethod="updateMis" OnUpdating="ods_Updating">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getDataFilt" TypeName="CMS_SC_Data.DS_ApplicazioneTableAdapters.MisureTableAdapter" FilterExpression=" CodSchedaVersNum LIKE '%{0}%' OR CodMisura LIKE '%{0}%' OR NomeMisura LIKE '%{0}%' OR NomePar LIKE '%{0}%' " UpdateMethod="updateMis" OnUpdating="ods_Updating">
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="searchVal" />
</FilterParameters>
CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+20 -3
View File
@@ -114,9 +114,26 @@ namespace CMS_SC.WebUserControls
{
get
{
bool answ = true;
return answ;
return (userIsCapoOfficina || userIsCapoGruppo);
}
}
/// <summary>
/// verifica se utente sia SuperUser
/// </summary>
public bool userIsCapoOfficina
{
get
{
return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoOfficinaRole"));
}
} /// <summary>
/// verifica se utente sia SuperUser
/// </summary>
public bool userIsCapoGruppo
{
get
{
return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoGruppo"));
}
}
/// <summary>
CMS_SC/WebUserControls/mod_testata.ascx.cs
+9
View File
@@ -433,6 +433,15 @@ namespace CMS_SC.WebUserControls
{
return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoOfficinaRole"));
}
} /// <summary>
/// verifica se utente sia SuperUser
/// </summary>
public bool userIsCapoGruppo
{
get
{
return devicesAuthProxy.stObj.userHasRight(memLayer.ML.CRS("CapoGruppo"));
}
}
/// <summary>
/// verifica se utente sia SuperUser
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll.config
+1
View File
@@ -32,6 +32,7 @@
<add key="autoEnrollEnabled" value="false" />
<add key="SuperAdminRole" value="SuperAdmin" />
<add key="CapoOfficinaRole" value="CapoOfficina" />
<add key="CapoGruppo" value="CapoOfficina" />
<add key="AnagAdminRole" value="CqSetSC" />
<!--gestione auth dispositivi-->
<add key="AuthCookieName" value="AuthDeviceCMS_SC" />
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.