Merge pull request #436 from kgiszewski/feature/slow-the-updates-roll

Feature/slow the updates roll
Merge logic
2017-10-07 07:10:36 -04:00 · 2017-10-03 13:31:43 -04:00 · 2017-10-03 13:28:25 -04:00 · 2017-10-03 13:27:03 -04:00 · 2017-10-03 11:07:10 -04:00 · 2017-10-03 08:56:52 -04:00
5 changed files with 19 additions and 9 deletions
@@ -20,6 +20,9 @@ namespace Archetype.Api
    [PluginController("ArchetypeApi")]
    public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
    {
+        private static DateTime _lastVersionCheck;
+        private const int IntervalInDaysBetweenVersionChecks = 7;
+
        public IEnumerable<object> GetAllPropertyEditors()
        {
            return
@@ -30,7 +33,7 @@ namespace Archetype.Api
        /// <summary>
        /// Gets all datatypes.
        /// </summary>
-        /// <returns></returns>
+        /// <returns>System.Object.</returns>
        public object GetAll()
        {
            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
@@ -139,7 +142,7 @@ namespace Archetype.Api
        [HttpPost]
        public object CheckForUpdates()
        {
-            if (!ArchetypeGlobalSettings.Instance.CheckForUpdates)
+            if (!ArchetypeGlobalSettings.Instance.CheckForUpdates || !IsItTimeToCheck())
            {
                return new
                {
@@ -148,6 +151,7 @@ namespace Archetype.Api
            }

            var updateNotificationModel = ArchetypeHelper.Instance.CheckForUpdates();
+            _lastVersionCheck = DateTime.UtcNow;

            return new
            {
@@ -158,5 +162,10 @@ namespace Archetype.Api
                url = updateNotificationModel.Url
            };
        }
+
+        internal bool IsItTimeToCheck()
+        {
+            return _lastVersionCheck.AddDays(IntervalInDaysBetweenVersionChecks) < DateTime.UtcNow;
+        }
    }
 }
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("1.17.0")]
-[assembly: AssemblyFileVersion("1.17.0")]
+[assembly: AssemblyVersion("1.17.1")]
+[assembly: AssemblyFileVersion("1.17.1")]
@@ -375,7 +375,7 @@
        margin-left: 0;
    }
    li {
-        line-height: 0;
+        line-height: 20px;
    }

    .show-validation.ng-invalid .control-group.error .control-label {
@@ -547,10 +547,11 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar

                            if(datatype) {
                                //try to get built-in label
-                                var templateLabelValue = getNativeLabel(datatype, rawValue, scope);
+                                var label = getNativeLabel(datatype, rawValue, scope);
                                
-                                //console.log("Native label...");
-                                //console.log(templateLabelValue);
+                                if (label) {
+                                    templateLabelValue = label;
+                                }
                            }
                        }
                    }
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.17.0",
+	"version": "1.17.1",
 	"url": "http://github.com/kgiszewski/archetype/",
 	"author": "Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Nicholas Westby - Et. Al.",
 	"authorUrl": "http://github.com/kgiszewski/archetype/",
Author	SHA1	Message	Date
Kevin Giszewski	a4c1a59e23	Merge pull request #436 from kgiszewski/feature/slow-the-updates-roll Feature/slow the updates roll	2017-10-07 07:10:36 -04:00
Kevin Giszewski	e164be1823	Merge logic	2017-10-03 13:31:43 -04:00
Kevin Giszewski	f32451fffa	Clean up private var	2017-10-03 13:28:25 -04:00
Kevin Giszewski	a541dbd038	Limit the version check to once every 7 days (unless the app is reloaded)	2017-10-03 13:27:03 -04:00
Kevin Giszewski	69e0bb70e5	Fix scrunchy fieldset picker titles	2017-10-03 11:07:10 -04:00
Kevin Giszewski	c22a2623c2	Merge pull request #434 from ceee/ui-refactor Update UI to better match Grid & Nested Content	2017-10-03 08:56:52 -04:00
Kevin Giszewski	ec2edce74c	Bump version	2017-09-25 13:31:52 -04:00
Kevin Giszewski	4756551518	Merge pull request #433 from Nicholas-Westby/fix/432-resolve-label-templates Fix for label templates sometimes not resolving: https://github.com/k…	2017-09-25 08:28:23 -04:00
Nicholas-Westby	e053b42950	Fix for label templates sometimes not resolving: https://github.com/kgiszewski/Archetype/issues/432	2017-09-23 17:16:50 -07:00