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

condizionato visibilità task a ruolo utente

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-21 23:00:45 +02:00
parent df61315b81
commit 90dcb9b9cf
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C-TRACK/WebUserControls/mod_menuTopCompact.ascx
+4 -4
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopCompact.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_menuTopCompact" %>
<div class="row text-uppercase align-items-center w-100 mx-0 px-0">
<div class="col-4 col-md-3 my-2 text-left">
<asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-block btn-primary text-truncate"> <i class="fas fa-tasks"></i> Task</asp:HyperLink>
<asp:HyperLink runat="server" ID="hlTask" NavigateUrl="~/task" CssClass="btn btn-block btn-primary text-truncate"> <i class="fas fa-tasks"></i> Commesse</asp:HyperLink>
</div>
<div class="col-4 col-md-6 my-0 text-center">
<asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/barcode" CssClass="btn btn-block btn-light text-truncate"> <asp:Label ID="lblTitolo" runat="server" Text="" CssClass="font-weight-bold" />
@@ -12,13 +12,13 @@
</div>
</div>
<div class="row text-uppercase align-items-center w-100 mx-0 px-0">
<div class="col-4 text-left text-truncate">
<div class="col-4 text-left text-truncate text-warning">
<%: NomeOpr %>
</div>
<div class="col-4 text-center text-truncate">
<div class="col-4 text-center text-truncate text-info">
<%: CurrNumTask %>
</div>
<div class="col-4 text-right text-truncate">
<div class="col-4 text-right text-truncate text-warning">
<%: DescPost %>
</div>
</div>
C-TRACK/WebUserControls/mod_menuTopCompact.ascx.cs
+3 -2
View File
@@ -13,13 +13,14 @@ namespace C_TRACK.WebUserControls
string lastPage = Request.Url.LocalPath.Split('/').Last();
if (!Page.IsPostBack)
{
// fix visibilità TASK
hlTask.Visible = devicesAuthProxy.stObj.userHasRight("CT_userStart");
// se l'utente NON c'è torno a login...
if (!devicesAuthProxy.stObj.isAuth)
{
if (lastPage != "" && lastPage != "login")
{
Session["nextPage"] = lastPage;
//}
Session["nextPage"] = lastPage;
}
// SE non sono in "safe page"
if (memLayer.ML.CRS("_loginPages").IndexOf(lastPage) < 0)
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=59']) {
withEnv(['NEXT_BUILD_NUMBER=60']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'C.TRACK'