diff --git a/BO/Controllers/BOBaseController.cs b/BO/Controllers/BOBaseController.cs
index ab4c3c1..462cf3a 100644
--- a/BO/Controllers/BOBaseController.cs
+++ b/BO/Controllers/BOBaseController.cs
@@ -24,6 +24,12 @@ namespace NP.BO.Controllers
ViewBag.issiteadmin = SUserInfo.IsSiteAdmin;
ViewBag.ckmainlmenu = CookieGet("leftmenutoggle", "0");
ViewBag.Menus = GetMENUS.Where(w => w.usertype == base.SUserInfo.UserType).ToList();
+
+ //로그인을 위해서 다 https로 돌림
+ if (!Request.IsSecureConnection)
+ {
+ filterContext.Result = new RedirectResult("https://" + Request.Url.Host + Request.Url.PathAndQuery);
+ }
}
}
}
diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index dc53c1d..b9bbeb3 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -862,8 +862,10 @@ namespace NP.BO.Controllers
ht.Add("typeedu", vm.stringval6);
ht.Add("typegrade", vm.stringval7);
ht.Add("typejob", vm.stringval8);
- ht.Add("ssdate", vm.stringval9 == null? "2019-12-01" : vm.stringval9);
- ht.Add("sedate", vm.stringval10 == null ? "2020-12-01" : vm.stringval10);
+ vm.stringval9 = vm.stringval9 == null ? vm.stringval == null ? "2019-01-01 00:00:00" : vm.stringval + "-01-01 00:00:00" : vm.stringval9;
+ vm.stringval10 = vm.stringval10 == null ? vm.stringval == null ? "2020-12-31 23:59:59" : vm.stringval + "-12-31 23:59:59" : vm.stringval10;
+ ht.Add("ssdate", vm.stringval9);
+ ht.Add("sedate", vm.stringval10);
switch (vm.stringval11)
{
case "이름": ht.Add("word", "username"); break;
diff --git a/BO/Views/croom/documentspast.cshtml b/BO/Views/croom/documentspast.cshtml
index f3bda2b..2ff121d 100644
--- a/BO/Views/croom/documentspast.cshtml
+++ b/BO/Views/croom/documentspast.cshtml
@@ -198,12 +198,6 @@
@section scripts{
}
\ No newline at end of file
diff --git a/BO/Views/data/learns.cshtml b/BO/Views/data/learns.cshtml
index bdbaf3b..d09f986 100644
--- a/BO/Views/data/learns.cshtml
+++ b/BO/Views/data/learns.cshtml
@@ -3,8 +3,8 @@
diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache
index a80dc89..f1926e3 100644
Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ
diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache
index 97db882..45b185a 100644
Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ
diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache
index 27293be..6158e8b 100644
Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ
diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs
index cd8dfa4..661ca80 100644
--- a/FO/Controllers/FOBaseController.cs
+++ b/FO/Controllers/FOBaseController.cs
@@ -293,7 +293,6 @@ namespace NP.FO.Controllers
System.Text.StringBuilder sbmauth = new System.Text.StringBuilder("");
var tops = "";
var topsauth = "";
- sbmauth.Append("Home");
foreach (var m in GetMENUPAGES.Where(w => w.pdepth == 0 && w.isopen == 1))
{
var mp = m.pagetype == 0 ? GetMENUPAGES.Where(w => w.pagetype > 0 && (w.m0 == m.pno || w.m1 == m.pno || w.m2 == m.pno || w.m3 == m.pno || w.m4 == m.pno)).FirstOrDefault() ?? new Model.MenuPage() { } : m;
diff --git a/FO/FO.csproj b/FO/FO.csproj
index 9251900..df2fe31 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -496,6 +496,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FO/Views/Shared/_Layout.cshtml b/FO/Views/Shared/_Layout.cshtml
index e710683..903aa79 100644
--- a/FO/Views/Shared/_Layout.cshtml
+++ b/FO/Views/Shared/_Layout.cshtml
@@ -48,9 +48,6 @@
var _ismain = 1;
$("li.topsubmenu@(ViewBag.MenuPage.m1)").addClass("current");
$("li.topmenu@(ViewBag.MenuPage.m0)").addClass("current");
- $(document).ready(function () {
- $(".gnbMenu").find("a:contains('마이페이지')").css("color", "#0070C0");
- });