Merge pull request #127 from granthughes/feature/wrongValuesSaved

[Bugfix] Edit pages can save values from previously viewed redirect
kipusoep · Jul 2, 2016 · b7b4169 · b7b4169
2 parents e9f54e5 + 1000b62
commit b7b4169
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/UI/UserControls/AdvancedView.ascx.cs b/UI/UserControls/AdvancedView.ascx.cs
@@ -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;

diff --git a/UI/UserControls/CustomView.ascx.cs b/UI/UserControls/CustomView.ascx.cs
@@ -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;