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

fix KitImport + master inherintance

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-20 18:39:41 +02:00
parent 13871d75a9
commit 40a791fded
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/site/KitRequestImporter.aspx
+20 -19
View File
@@ -1,29 +1,30 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="KitRequestImporter.aspx.cs" Inherits="NKC_WF.KitRequestImporter" %>
<%@ Register Src="~/WebUserControls/cmp_fileUpload.ascx" TagPrefix="uc1" TagName="cmp_fileUpload" %>
<%@ Register Src="~/WebUserControls/cmp_kitList.ascx" TagPrefix="uc1" TagName="cmp_kitList" %>
<%@ Register Src="~/WebUserControls/cmp_kitImpCheck.ascx" TagPrefix="uc1" TagName="cmp_kitImpCheck" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="card" style="width: 100%;">
<div class="card-header">
<h3><%: traduci("KitManager") %></h3>
</div>
<div class="card-body">
<div class="row">
<div class="col-12">
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" />
<hr />
</div>
<div class="col-12">
<uc1:cmp_kitImpCheck runat="server" id="cmp_kitImpCheck" />
</div>
<div class="col-12" runat="server" id="divKitList">
<uc1:cmp_kitList runat="server" ID="cmp_kitList" />
</div>
<div class="container">
<div class="card" style="width: 100%;">
<div class="card-header">
<h3><%: traduci("KitManager") %></h3>
</div>
<div class="card-body">
<div class="row">
<div class="col-12">
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" />
<hr />
</div>
<div class="col-12">
<uc1:cmp_kitImpCheck runat="server" ID="cmp_kitImpCheck" />
</div>
<div class="col-12" runat="server" id="divKitList">
<uc1:cmp_kitList runat="server" ID="cmp_kitList" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</asp:Content>
NKC_WF/site/KitRequestImporter.aspx.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
((SiteMaster)this.Master).showSearch = false;
doUpdate();
cmp_kitImpCheck.Visible = false;
}