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

fix admin page!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-13 17:55:40 +01:00
parent 360599e736
commit 8d181ae3fa
4 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Smart/Web.config
+7 -7
View File
@@ -53,8 +53,8 @@
<add key="titleApp" value="GPW" />
<add key="welcomeApp" value="GPW_welcome" />
<add key="SiteName" value="Steamware" />
<!--<add key="mainRev" value="1.8"/>
<add key="minRev" value="375"/>-->
<!--<add key="mainRev" value="1.8" />
<add key="minRev" value="375" />-->
<add key="copyRight" value="SteamWare" />
<add key="CodModulo" value="GPW" />
<add key="_safePages" value="unauthorized.aspx#forceUser.aspx#login#login.aspx#test.aspx#Test.aspx" />
@@ -138,10 +138,10 @@
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
@@ -227,4 +227,4 @@
</handlers>
</system.webServer>
</location>
</configuration>
</configuration>
GPW_Smart/WebUserControls/mod_resetUserAuthKey.ascx
+39 -35
View File
@@ -1,43 +1,47 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_resetUserAuthKey.ascx.cs"
Inherits="GPW.WebUserControls.mod_resetUserAuthKey" %>
Inherits="GPW.WebUserControls.mod_resetUserAuthKey" %>
<div class="form-group">
<div class="row">
<div class="col-12">
<label for="ddlIdxDipendente">
Selezionare Dipendente:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsDipendenti" DataTextField="label" DataValueField="value" CssClass="form-control">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsDipendenti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
</div>
<div class="col-12">
<label for="UserAuthKey">UserAuthKey:</label>
<asp:TextBox runat="server" ID="txtUserAuthKey" TextMode="Password" CssClass="form-control" />
<asp:RequiredFieldValidator ID="rfvUserAuthKey" runat="server" ErrorMessage="!!!" ControlToValidate="txtUserAuthKey" />
</div>
<div class="col-12">
<label for="AuthKey">
Admin Auth Key:</label>
<asp:TextBox runat="server" ID="txtAuthKey" TextMode="Password" CssClass="form-control" />
<asp:RequiredFieldValidator ID="rfvAuthKey" runat="server" ErrorMessage="!!!" ControlToValidate="txtAuthKey" />
</div>
<div class="col-12">
<asp:Label runat="server" ID="lblWarning" Visible="false" />
<div class="row">
<div class="col">
<asp:LinkButton runat="server" ID="lbtConferma" OnClick="btnConferma_Click" CssClass="btn btn-block btn-success">Salva</asp:LinkButton>
<div class="row">
<div class="col-12">
<label for="ddlIdxDipendente">
Selezionare Dipendente:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsDipendenti" DataTextField="label" DataValueField="value" CssClass="form-control">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsDipendenti" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="true" Name="Conditio" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAnnulla" CausesValidation="false" CssClass="btn btn-block btn-danger">Annulla</asp:LinkButton>
<div class="col-12">
<label for="UserAuthKey">UserAuthKey:</label>
<asp:TextBox runat="server" ID="txtUserAuthKey" TextMode="Password" CssClass="form-control" />
<asp:RequiredFieldValidator ID="rfvUserAuthKey" runat="server" ErrorMessage="!!!" ControlToValidate="txtUserAuthKey" />
</div>
</div>
<div class="row">
<div class="col text-secondary small">
Questa funzione permette di resettare la AuthKey di un singolo utente in modo che
<div class="col-12">
<label for="AuthKey">
Admin Auth Key:</label>
<asp:TextBox runat="server" ID="txtAuthKey" TextMode="Password" CssClass="form-control" />
<asp:RequiredFieldValidator ID="rfvAuthKey" runat="server" ErrorMessage="!!!" ControlToValidate="txtAuthKey" />
</div>
<div class="col-12">
<asp:Label runat="server" ID="lblWarning" Visible="false" />
<div class="row">
<div class="col">
<asp:LinkButton runat="server" ID="lbtConferma" OnClick="btnConferma_Click" CssClass="btn btn-block btn-success">Salva</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAnnulla" CausesValidation="false" CssClass="btn btn-block btn-danger">Annulla</asp:LinkButton>
</div>
</div>
<div class="row">
<div class="col text-secondary small">
Questa funzione permette di resettare la AuthKey di un singolo utente in modo che
questi possa (re)inserire i devices tra quelli gestiti.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx
+23 -20
View File
@@ -1,25 +1,28 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_sendAuthToEmail.ascx.cs" Inherits="GPW.WebUserControls.mod_sendAuthToEmail" %>
<div class="form-group">
<label for="ddlIdxDipendente">
Selezionare Dipendente:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsDipendenti" DataTextField="label" DataValueField="value" CssClass="form-control">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsDipendenti" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
<asp:Label runat="server" ID="lblWarning" Visible="false" />
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtSendEmail" Text="Email" CssClass="btn btn-block btn-success" CausesValidation="false" OnClick="lbtSendEmail_Click" />
<label for="ddlIdxDipendente">
Selezionare Dipendente:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsDipendenti" DataTextField="label" DataValueField="value" CssClass="form-control">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsDipendenti" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="true" Name="Conditio" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Label runat="server" ID="lblWarning" Visible="false" />
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtSendEmail" Text="Email" CssClass="btn btn-block btn-success" CausesValidation="false" OnClick="lbtSendEmail_Click" />
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAnnulla" Text="Annulla" CssClass="btn btn-block btn-warning" CausesValidation="false" />
</div>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAnnulla" Text="Annulla" CssClass="btn btn-block btn-warning" CausesValidation="false" />
<div class="row">
<div class="col text-secondary small">
Questa funzione permette di inviare la AuthKey all'email registrata di un utente in modo che questo possa (re)inserire devices cliccando sull'URL ricevuto.
</div>
</div>
</div>
<div class="row">
<div class="col text-secondary small">
Questa funzione permette di inviare la AuthKey all'email registrata di un utente in modo che questo possa (re)inserire devices cliccando sull'URL ricevuto.
</div>
</div>
</div>
</div>
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4141']) {
withEnv(['NEXT_BUILD_NUMBER=4142']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'