Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Product spec attribute custom html #223

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Product spec attribute custom html #223

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c66b7a
Widget slider is showing other stores images #193
Dec 10, 2021
c9cf7e8
Merge branch 'master' of https://github.com/i-cuboid/grandnode2
Dec 10, 2021
4b47db1
Merge branch 'grandnode:master' into master
Nikhil13x Dec 11, 2021
ab6d31e
Revert "Widget slider is showing other stores images #193"
Dec 11, 2021
75f1f9d
Corrected null check
Dec 11, 2021
aecd77c
Merge branch 'grandnode:master' into master
Nikhil13x Dec 13, 2021
368a1d6
Merge pull request #1 from i-cuboid/bugfix/nullcheck
Dec 13, 2021
e8654ec
Merge branch 'grandnode:master' into master
Nikhil13x Dec 18, 2021
843e233
Merge branch 'grandnode:master' into master
Nikhil13x Dec 25, 2021
a4cb5b1
Merge branch 'grandnode:master' into master
Nikhil13x Jan 1, 2022
93a9c99
https://github.com/grandnode/grandnode2/issues/200
jithendrajp Jan 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
@{
Layout = "";
}
<form id="ProductSpecificationPopup" asp-area="@Constants.AreaAdmin"
asp-controller="Product" asp-action="ProductSpecAttrPopup"
<form id="ProductSpecificationPopup" asp-area="@Constants.AreaAdmin"
asp-controller="Product" asp-action="ProductSpecAttrPopup"
enctype="multipart/form-data" method="post"
asp-route-ProductId="@Context.Request.Query["ProductId"]"
asp-route-Id="@Context.Request.Query["Id"]">
Expand Down Expand Up @@ -61,7 +61,11 @@
</div>
<div class="form-group" id="pnlCustomValue">
<admin-label asp-for="CustomValue" />
<div class="col-md-9 col-sm-9">
<div class="col-md-9 col-sm-9" id="pnlCustomHTMLText">
<admin-input asp-for="CustomValue" asp-template="Editor" />
<span asp-validation-for="CustomValue"></span>
</div>
<div class="col-md-9 col-sm-9" id="pnlCustomValueText">
<admin-input asp-for="CustomValue" />
<span asp-validation-for="CustomValue"></span>
</div>
Expand Down Expand Up @@ -174,23 +178,31 @@
$('#pnlCustomValue').hide();
$('#pnlCustomName').hide();
$('#disableOnCustom').show();
$('#pnlCustomValueText').hide();
$('#pnlCustomHTMLText').hide();
$('#pnlAllowFiltering').show();
} else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomText).ToString())) {
$('#pnlSpecificationAttributeOptionId').hide();
$('#pnlCustomName').show();
$('#pnlCustomValue').show();
$('#pnlCustomValueText').show();
$('#pnlCustomHTMLText').hide();
$('#disableOnCustom').hide();
$('#pnlAllowFiltering').hide();
} else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomHtmlText).ToString())) {
$('#pnlSpecificationAttributeOptionId').hide();
$('#pnlCustomName').show();
$('#pnlCustomValue').show();
$('#pnlCustomValueText').hide();
$('#pnlCustomHTMLText').show();
$('#disableOnCustom').hide();
$('#pnlAllowFiltering').hide();
} else if (selectedTypeId == @(((int)SpecificationAttributeType.Hyperlink).ToString())) {
$('#pnlSpecificationAttributeOptionId').hide();
$('#pnlCustomName').show();
$('#pnlCustomValue').show();
$('#pnlCustomValueText').hide();
$('#pnlCustomHTMLText').hide();
$('#disableOnCustom').hide();
$('#pnlAllowFiltering').hide();
}
Expand Down