Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

[Bugfix] Edit pages can save values from previously viewed redirect #127

Merged
1 commit merged into from Jul 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 8 additions & 13 deletions UI/UserControls/AdvancedView.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,17 @@ public void LoadView()
ddlRootNode.SelectedValue = UrlTrackerModel.RedirectRootNodeId.ToString();
}

if (!string.IsNullOrEmpty(UrlTrackerModel.OldRegex) && string.IsNullOrEmpty(UrlTrackerModel.OldUrl))
{
tbOldRegex.Text = UrlTrackerModel.OldRegex;
}
else
{
tbOldUrl.Text = UrlTrackerModel.OldUrl;
tbOldUrlQueryString.Text = UrlTrackerModel.OldUrlQueryString;
}
tbOldRegex.Text = UrlTrackerModel.OldRegex;
tbOldUrl.Text = UrlTrackerModel.OldUrl;
tbOldUrlQueryString.Text = UrlTrackerModel.OldUrlQueryString;

if (UrlTrackerModel.RedirectNodeId.HasValue)
cpRedirectNode.Value = UrlTrackerModel.RedirectNodeId.Value.ToString();
tbRedirectUrl.Text = UrlTrackerModel.RedirectUrl;
if (UrlTrackerModel.RedirectHttpCode == 301)
rbPermanent.Checked = true;
else if (UrlTrackerModel.RedirectHttpCode == 302)
rbTemporary.Checked = true;

rbPermanent.Checked = UrlTrackerModel.RedirectHttpCode == 301;
rbTemporary.Checked = UrlTrackerModel.RedirectHttpCode == 302;

cbRedirectPassthroughQueryString.Checked = UrlTrackerModel.RedirectPassThroughQueryString;
cbForceRedirect.Checked = UrlTrackerModel.ForceRedirect;
tbNotes.Text = UrlTrackerModel.Notes;
Expand Down
11 changes: 7 additions & 4 deletions UI/UserControls/CustomView.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,25 @@ public void LoadView()
if (!string.IsNullOrEmpty(UrlTrackerModel.OldRegex) && string.IsNullOrEmpty(UrlTrackerModel.OldUrl))
{
mvRedirectFrom.SetActiveView(vwRedirectFromRegex);
tbOldUrl.Text = null;
tbOldUrlQueryString.Text = null;
tbOldRegex.Text = UrlTrackerModel.OldRegex;
}
else
{
mvRedirectFrom.SetActiveView(vwRedirectFromUrl);
tbOldUrl.Text = UrlTrackerModel.OldUrl;
tbOldUrlQueryString.Text = UrlTrackerModel.OldUrlQueryString;
tbOldRegex.Text = null;
}
mvRedirect.SetActiveView(UrlTrackerModel.RedirectNodeId.HasValue ? vwRedirectNode : vwRedirectUrl);
if (UrlTrackerModel.RedirectNodeId.HasValue)
cpRedirectNode.Value = UrlTrackerModel.RedirectNodeId.Value.ToString();
tbRedirectUrl.Text = UrlTrackerModel.RedirectUrl;
if (UrlTrackerModel.RedirectHttpCode == 301)
rbPermanent.Checked = true;
else if (UrlTrackerModel.RedirectHttpCode == 302)
rbTemporary.Checked = true;

rbPermanent.Checked = UrlTrackerModel.RedirectHttpCode == 301;
rbTemporary.Checked = UrlTrackerModel.RedirectHttpCode == 302;

cbRedirectPassthroughQueryString.Checked = UrlTrackerModel.RedirectPassThroughQueryString;
cbForceRedirect.Checked = UrlTrackerModel.ForceRedirect;
tbNotes.Text = UrlTrackerModel.Notes;
Expand Down