[BugFix] "Remove at" not working properly ([#49](#49))

[BugFix] Error during installation: 'ASP.UmbracoHelper' does not contain a definition for 'IsVersion7OrNewer' ([#52](#52)) [BugFix] JavaScripts errors in backend in IE11 ([#31](#31), updated jQuery) [Feature] Domain on child node with cross site/host redirects ([#40](#40))
kipusoep · Jan 28, 2015 · e88bde0 · e88bde0
1 parent a464043
commit e88bde0
Show file tree

Hide file tree

Showing 14 changed files with 88 additions and 127 deletions.
diff --git a/Models/axrk0021.nh2 b/Models/axrk0021.nh2
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.*")]
+[assembly: AssemblyVersion("3.4.*")]
 
 // SQL
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.SQL.MicrosoftSqlServer.create-table-1.sql", "text/plain")]
@@ -68,7 +68,7 @@
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.bootstrap.js", "text/javascript")]
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.bootstrap.min.js", "text/javascript")]
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.installer.js", "text/javascript")]
-[assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.10.1.min.js", "text/javascript")]
+[assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.11.2.min.js", "text/javascript")]
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-migrate-1.2.1.min.js", "text/javascript")]
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery.validate.additional-methods.js", "text/javascript")]
 [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery.validate.additional-methods.min.js", "text/javascript")]

diff --git a/README.md b/README.md
@@ -46,6 +46,11 @@ Set to true to disable tracking not found (404) requests.
 Set to false to disable appending a port number to redirect URLs
 
 ## Changelog ##
+*	3.4 [2014/01/28]
+    * [BugFix] "Remove at" not working properly ([#49](https://github.com/kipusoep/UrlTracker/issues/49))
+    * [BugFix] Error during installation: 'ASP.UmbracoHelper' does not contain a definition for 'IsVersion7OrNewer' ([#52](https://github.com/kipusoep/UrlTracker/issues/52))
+    * [BugFix] JavaScripts errors in backend in IE11 ([#31](https://github.com/kipusoep/UrlTracker/issues/31), updated jQuery)
+    * [Feature] Domain on child node with cross site/host redirects ([#40](https://github.com/kipusoep/UrlTracker/issues/40))
 *	3.3 [2014/12/11]
     * [BugFix] The UrlTracker dashboard wasn't working in some cases since v3.2
 *	3.2 [2014/11/14]

diff --git a/Repositories/UrlTrackerRepository.cs b/Repositories/UrlTrackerRepository.cs
@@ -10,6 +10,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
+using Umbraco.Web;
 
 namespace InfoCaster.Umbraco.UrlTracker.Repositories
 {
@@ -92,6 +93,9 @@ public static void AddUrlTrackerEntry(UrlTrackerModel urlTrackerModel)
 
         public static void AddGoneEntryByNodeId(int nodeId)
         {
+            if (UmbracoContext.Current == null) // NiceUrl will throw an exception if UmbracoContext is null, and we'll be unable to retrieve the URL of the node
+                return;
+
             string url = umbraco.library.NiceUrl(nodeId);
             if (url == "#")
                 return;
@@ -420,7 +424,7 @@ public static void UpdateUrlTrackerEntry(UrlTrackerModel urlTrackerModel)
                 ReloadForcedRedirectsCache();
         }
         #endregion
-        
+
         #region Support
         public static bool GetUrlTrackerTableExists()
         {

diff --git a/UI/Installer/UrlTrackerInstaller.ascx b/UI/Installer/UrlTrackerInstaller.ascx
@@ -37,6 +37,6 @@
     </div>
 </umb:PropertyPanel>
 
-<script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.10.1.min.js") %>"></script>
+<script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.11.2.min.js") %>"></script>
 <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-migrate-1.2.1.min.js") %>"></script>
 <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.installer.js") %>"></script>
diff --git a/UI/UrlTrackerInfo.aspx b/UI/UrlTrackerInfo.aspx
@@ -11,7 +11,7 @@
     <link rel="stylesheet" type="text/css" href="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.css.bootstrap.min.css") %>" />
     <link rel="stylesheet" type="text/css" href="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.css.info.css") %>" />
 
-    <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.10.1.min.js") %>"></script>
+    <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.11.2.min.js") %>"></script>
     <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-migrate-1.2.1.min.js") %>"></script>
     <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.bootstrap.min.js") %>"></script>
 </head>
@@ -25,7 +25,7 @@
             <li><a href="#roadmap" data-toggle="tab">Roadmap</a></li>
             <li><a href="#credits" data-toggle="tab">Credits</a></li>
         </ul>
- 
+
         <div class="tab-content">
             <div class="tab-pane active" id="info">
                 <p>
@@ -86,6 +86,15 @@
             </div>
             <div class="tab-pane" id="changeLog">
                 <ul>
+                    <li>
+                        3.4 [2014/01/28]
+                        <ul>
+                            <li>[BugFix] "Remove at" not working properly (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/49">#49</a>)</li>
+                            <li>[BugFix] Error during installation: 'ASP.UmbracoHelper' does not contain a definition for 'IsVersion7OrNewer' (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/52">#52</a>)</li>
+                            <li>[BugFix] JavaScripts errors in backend in IE11 (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/31">#31</a>, updated jQuery)</li>
+                            <li>[Feature] Domain on child node with cross site/host redirects (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/40">#40</a>)</li>
+                        </ul>
+                    </li>
                     <li>
                         3.3 [2014/12/11]
                         <ul>
@@ -104,7 +113,7 @@
                         3.1 [2014/11/13]
                         <ul>
                             <li>[Improvement] SQL Compact Edition is now supported thanks to Ornella Geboers and Sandro Mastronardi</li>
-                            <li>[Improvement] Versioning is now based on major.minor.build.revision (<a href="http://stackoverflow.com/questions/356543/can-i-automatically-increment-the-file-build-version-when-using-visual-studio">source</a>)</li>
+                            <li>[Improvement] Versioning is now based on major.minor.build.revision (<a target="_blank" href="http://stackoverflow.com/questions/356543/can-i-automatically-increment-the-file-build-version-when-using-visual-studio">source</a>)</li>
                         </ul>
                     </li>
                     <li>
@@ -116,14 +125,14 @@
                     <li>
                         3.0.1 [2014/07/09]
                         <ul>
-                            <li>[BugFix] Fixed an issue with the installer (table does not exist: <a href="https://github.com/kipusoep/UrlTracker/issues/14">#14</a>)</li>
+                            <li>[BugFix] Fixed an issue with the installer (table does not exist: <a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/14">#14</a>)</li>
                         </ul>
                     </li>
                     <li>
                         3.0.0 [2014/06/27]
                         <ul>
                             <li>[Upgrade] All code has been rewritten to use the new services and models of umbraco v6.1</li>
-                            <li>[BugFix] URL changes are tracked again (<a href="https://github.com/kipusoep/UrlTracker/issues/9" target="_blank">#9</a>)</li>
+                            <li>[BugFix] URL changes are tracked again (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/9">#9</a>)</li>
                             <li>[BugFix] 410 Gone response now gets lower priority than other response codes</li>
                             <li>[Improvement] Improved performance, removed hitting the DB for every single request, added caching instead</li>
                             <li>[Dropped] Dropped support for pre-6.1 umbraco versions</li>

diff --git a/UI/UrlTrackerManager.aspx b/UI/UrlTrackerManager.aspx
@@ -15,7 +15,7 @@
     <link rel="stylesheet" type="text/css" href="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.css.bootstrap.min.css") %>" />
     <link rel="stylesheet" type="text/css" href="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.css.urltracker.css") %>" />
 
-    <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.10.1.min.js") %>"></script>
+    <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-1.11.2.min.js") %>"></script>
     <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery-migrate-1.2.1.min.js") %>"></script>
     <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.bootstrap.min.js") %>"></script>
     <script type="text/javascript" src="<%= Page.ClientScript.GetWebResourceUrl(typeof(UrlTrackerResources), "InfoCaster.Umbraco.UrlTracker.UI.res.js.jquery.validate.js") %>"></script>

diff --git a/UI/UserControls/AutoView.ascx.cs b/UI/UserControls/AutoView.ascx.cs
@@ -11,58 +11,58 @@
 
 namespace InfoCaster.Umbraco.UrlTracker.UI.UserControls
 {
-	public partial class AutoView : System.Web.UI.UserControl, IUrlTrackerView
-	{
-		public UrlTrackerModel UrlTrackerModel { get; set; }
+    public partial class AutoView : System.Web.UI.UserControl, IUrlTrackerView
+    {
+        public UrlTrackerModel UrlTrackerModel { get; set; }
 
-		protected override void OnPreRender(EventArgs e)
-		{
-			base.OnPreRender(e);
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
 
-			lnkOldUrl.ToolTip = UrlTrackerResources.OldUrlTestInfo;
-			rbPermanent.Text = UrlTrackerResources.RedirectType301;
-			rbTemporary.Text = UrlTrackerResources.RedirectType302;
-			cbRedirectPassthroughQueryString.Text = UrlTrackerResources.PassthroughQueryStringLabel;
-		}
+            lnkOldUrl.ToolTip = UrlTrackerResources.OldUrlTestInfo;
+            rbPermanent.Text = UrlTrackerResources.RedirectType301;
+            rbTemporary.Text = UrlTrackerResources.RedirectType302;
+            cbRedirectPassthroughQueryString.Text = UrlTrackerResources.PassthroughQueryStringLabel;
+        }
 
-		public void LoadView()
-		{
-			UrlTrackerDomain domain = null;
-			Node redirectRootNode = new Node(UrlTrackerModel.RedirectRootNodeId);
-
-			List<UrlTrackerDomain> domains = UmbracoHelper.GetDomains();
-			domain = domains.FirstOrDefault(x => x.NodeId == redirectRootNode.Id);
-			if (domain == null)
-				domain = new UrlTrackerDomain(-1, redirectRootNode.Id, HttpContext.Current.Request.Url.Host);
-			if (!domains.Any())
-				pnlRootNode.Visible = false;
-			else
-			{
-				lnkRootNode.Text = string.Format("{0} ({1})", domain.Node.Name, domain.Name);
-				lnkRootNode.ToolTip = UrlTrackerResources.SyncTree;
-				lnkRootNode.NavigateUrl = string.Format("javascript:parent.UmbClientMgr.mainTree().syncTree('{0}', false);", redirectRootNode.Path);
-			}
+        public void LoadView()
+        {
+            UrlTrackerDomain domain = null;
+            Node redirectRootNode = new Node(UrlTrackerModel.RedirectRootNodeId);
 
-			lnkOldUrl.Text = string.Format("{0} <i class=\"icon-share\"></i>", UrlTrackerModel.CalculatedOldUrl);
-			lnkOldUrl.NavigateUrl = UrlTrackerModel.CalculatedOldUrlWithDomain;
-			Node redirectNode = new Node(UrlTrackerModel.RedirectNodeId.Value);
+            List<UrlTrackerDomain> domains = UmbracoHelper.GetDomains();
+            domain = domains.FirstOrDefault(x => x.NodeId == redirectRootNode.Id);
+            if (domain == null)
+                domain = new UrlTrackerDomain(-1, redirectRootNode.Id, HttpContext.Current.Request.Url.Host);
+            if (!domains.Any())
+                pnlRootNode.Visible = false;
+            else
+            {
+                lnkRootNode.Text = string.Format("{0} ({1})", domain.Node.Name, domain.Name);
+                lnkRootNode.ToolTip = UrlTrackerResources.SyncTree;
+                lnkRootNode.NavigateUrl = string.Format("javascript:parent.UmbClientMgr.mainTree().syncTree('{0}', false);", redirectRootNode.Path);
+            }
+
+            lnkOldUrl.Text = string.Format("{0} <i class=\"icon-share\"></i>", UrlTrackerModel.CalculatedOldUrl);
+            lnkOldUrl.NavigateUrl = UrlTrackerModel.CalculatedOldUrlWithDomain;
+            Node redirectNode = new Node(UrlTrackerModel.RedirectNodeId.Value);
             lnkRedirectNode.Text = redirectNode.Id > 0 ? redirectNode.Name : UrlTrackerResources.RedirectNodeUnpublished;
-			lnkRedirectNode.ToolTip = UrlTrackerResources.SyncTree;
+            lnkRedirectNode.ToolTip = UrlTrackerResources.SyncTree;
             lnkRedirectNode.NavigateUrl = string.Format("javascript:parent.UmbClientMgr.mainTree().syncTree('{0}', false);", redirectNode.Path);
-			if (UrlTrackerModel.RedirectHttpCode == 301)
-				rbPermanent.Checked = true;
-			else if (UrlTrackerModel.RedirectHttpCode == 302)
-				rbTemporary.Checked = true;
-			cbRedirectPassthroughQueryString.Checked = UrlTrackerModel.RedirectPassThroughQueryString;
-			lblNotes.Text = UrlTrackerModel.Notes;
-			lblInserted.Text = UrlTrackerModel.Inserted.ToString();
-		}
+            if (UrlTrackerModel.RedirectHttpCode == 301)
+                rbPermanent.Checked = true;
+            else if (UrlTrackerModel.RedirectHttpCode == 302)
+                rbTemporary.Checked = true;
+            cbRedirectPassthroughQueryString.Checked = UrlTrackerModel.RedirectPassThroughQueryString;
+            lblNotes.Text = UrlTrackerModel.Notes;
+            lblInserted.Text = UrlTrackerModel.Inserted.ToString();
+        }
 
-		public void Save()
-		{
-			UrlTrackerModel.RedirectHttpCode = rbPermanent.Checked ? 301 : 302;
-			UrlTrackerModel.RedirectPassThroughQueryString = cbRedirectPassthroughQueryString.Checked;
-			UrlTrackerRepository.UpdateUrlTrackerEntry(UrlTrackerModel);
-		}
-	}
+        public void Save()
+        {
+            UrlTrackerModel.RedirectHttpCode = rbPermanent.Checked ? 301 : 302;
+            UrlTrackerModel.RedirectPassThroughQueryString = cbRedirectPassthroughQueryString.Checked;
+            UrlTrackerRepository.UpdateUrlTrackerEntry(UrlTrackerModel);
+        }
+    }
 }
diff --git a/UI/UserControls/CustomView.ascx.cs b/UI/UserControls/CustomView.ascx.cs
@@ -48,7 +48,7 @@ public void LoadView()
                 pnlRootNode.Visible = false;
             }
 
-            if (ddlRootNode.DataSource != null)
+            if (ddlRootNode.Items.Count > 1)
             {
                 ddlRootNode.SelectedValue = UrlTrackerModel.RedirectRootNodeId.ToString();
             }

diff --git a/UI/UserControls/NotFoundView.ascx.cs b/UI/UserControls/NotFoundView.ascx.cs
@@ -43,7 +43,7 @@ public void LoadView()
                 lnkRootNode.ToolTip = UrlTrackerResources.SyncTree;
                 lnkRootNode.NavigateUrl = string.Format("javascript:parent.UmbClientMgr.mainTree().syncTree('{1}', false);", redirectRootNode.Id, redirectRootNode.Path);
             }
-            
+
             Uri oldUri = new Uri(UrlTrackerModel.CalculatedOldUrlWithDomain);
             lnkOldUrl.Text = string.Format("{0} <i class=\"icon-share\"></i>", oldUri.AbsolutePath.StartsWith("/") ? oldUri.AbsolutePath.Substring(1) : oldUri.AbsolutePath);
             lnkOldUrl.NavigateUrl = oldUri.ToString();

diff --git a/UI/res/js/jquery-1.10.1.min.js b/UI/res/js/jquery-1.10.1.min.js
diff --git a/UI/res/js/jquery-1.11.2.min.js b/UI/res/js/jquery-1.11.2.min.js