diff --git a/SGGL/FineUIPro.Web/Login.aspx b/SGGL/FineUIPro.Web/Login.aspx index 133dd338..759ecd30 100644 --- a/SGGL/FineUIPro.Web/Login.aspx +++ b/SGGL/FineUIPro.Web/Login.aspx @@ -216,7 +216,8 @@ setCookie("u", ''); setCookie("p", ''); } - top.window.location.href = data.d; + window.location.href = data.d; + // top.window.location.href = data.d; } } }) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs index 6b9a61c0..adffb8da 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs @@ -81,7 +81,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.tvControlItem.SelectedNode.NodeID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs index 0b03f9ae..f8164783 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs @@ -258,7 +258,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { @@ -277,7 +278,8 @@ namespace FineUIPro.Web.ProjectData CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray); } - PageContext.Redirect("~/index.aspx", "_top"); + //PageContext.Redirect("~/index.aspx", "_top"); + PageContext.Redirect("~/index.aspx"); } protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index 33751330..3d8e4a21 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -501,7 +501,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 632abdb2..65d706ef 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -75,7 +75,7 @@ + EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">