Some fixes, mostly in BlogRoll widget (3.2.1.5)

rxtur · rxtur · commit f7d2105aa172 · 2016-03-13T16:09:47.000-05:00
diff --git a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs
@@ -19,5 +19,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 [assembly: AllowPartiallyTrustedCallers]
-[assembly: AssemblyVersion("3.2.1.4")]
+[assembly: AssemblyVersion("3.2.1.5")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs
@@ -79,6 +79,11 @@ public abstract class CacheBase : IEnumerable
         ///<returns></returns>
         public abstract object Remove(string key);
 
+        /// <summary>
+        /// Reset cache provider
+        /// </summary>
+        public abstract void Reset();
+
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
diff --git a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs
@@ -154,5 +154,29 @@ public override object Remove(string key)
         {
             return _cache.Remove(_keyPrefix + key);
         }
+
+        /// <summary>
+        /// Reset cache provider
+        /// </summary>
+        public override void Reset()
+        {
+            var keys = new System.Collections.Specialized.StringCollection();
+            foreach (var item in _cache)
+            {
+                var x = (DictionaryEntry)item;
+                keys.Add(x.Key.ToString());
+            }
+            if (keys.Count > 0)
+            {
+                foreach (var key in keys)
+                {
+                    if (key.StartsWith(_keyPrefix))
+                    {
+                        // Utils.Log(key);
+                        _cache.Remove(key);
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs
@@ -101,9 +101,13 @@ public override List<BlogRollItem> FillBlogRoll()
         public override void InsertBlogRollItem(BlogRollItem blogRollItem)
         {
             var blogRolls = BlogRollItem.BlogRolls;
+            if(blogRolls == null)
+            {
+                blogRolls = new List<BlogRollItem>();
+            }
             blogRolls.Add(blogRollItem);
 
-            this.WriteBlogRollFile(blogRolls);
+            WriteBlogRollFile(blogRolls);
         }
 
         /// <summary>
diff --git a/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs b/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs
@@ -38,6 +38,10 @@ public HttpResponseMessage Put([FromBody]Settings settings, string action = "")
                 return Request.CreateResponse(HttpStatusCode.OK, retMsg);
             }
         }
+        else if(action == "clearCache")
+        {
+            BlogEngine.Core.Blog.CurrentInstance.Cache.Reset();
+        }
         else
         {
             repository.Update(settings);
diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx
@@ -1607,10 +1607,10 @@
     <value>Разрешить</value>
   </data>
   <data name="AllPostsBy" xml:space="preserve">
-    <value>Все запили</value>
+    <value>Все записи</value>
   </data>
   <data name="AllPostsTagged" xml:space="preserve">
-    <value>Все запили отмеченные как</value>
+    <value>Все записи отмеченные как</value>
   </data>
   <data name="anotherEmail" xml:space="preserve">
     <value>Пожалуйста выберите другой email адрес</value>
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs
@@ -128,11 +128,14 @@ public void Add(NameValueCollection form)
             br.Xfn = GetXfnString(form);
 
             int largestSortIndex = -1;
-            foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls)
+            if(BlogRollItem.BlogRolls != null && BlogRollItem.BlogRolls.Count > 0)
             {
-                if (brExisting.SortIndex > largestSortIndex)
+                foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls)
                 {
-                    largestSortIndex = brExisting.SortIndex;
+                    if (brExisting.SortIndex > largestSortIndex)
+                    {
+                        largestSortIndex = brExisting.SortIndex;
+                    }
                 }
             }
             br.SortIndex = largestSortIndex + 1;
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml
@@ -173,22 +173,25 @@
                     <th width="20%">XFN <a href="http://gmpg.org/xfn/intro" title="XFN" target="_blank"><i class="fa fa-info-circle"></i></a></th>
                 </tr>
             </thead>
-            <tbody>
-                @foreach (var roll in rolls)
-                {
-                <tr>
-                    <td class="item-title">
-                        <a title="@roll.Title" href="#" onclick="submitForm('@roll.Id')" class="text-ellipsis pull-left">@roll.Title</a>
-                        <a title="@roll.FeedUrl" class="external-link pull-right" target="_blank" href="@roll.FeedUrl"><i class="fa fa-external-link"></i></a>
-                    </td>
-                    <td>@roll.Description</td>
-                    <td>@roll.Xfn</td>
-                </tr>
-                }
+            <tbody>              
                 @if (rolls == null || rolls.Count == 0)
                 {
                 <tr><td colspan="3">@Resources.labels.empty</td></tr>
                 }
+                else
+                {
+                    foreach (var roll in rolls)
+                    {
+                    <tr>
+                        <td class="item-title">
+                            <a title="@roll.Title" href="#" onclick="submitForm('@roll.Id')" class="text-ellipsis pull-left">@roll.Title</a>
+                            <a title="@roll.FeedUrl" class="external-link pull-right" target="_blank" href="@roll.FeedUrl"><i class="fa fa-external-link"></i></a>
+                        </td>
+                        <td>@roll.Description</td>
+                        <td>@roll.Xfn</td>
+                    </tr>
+                    }
+                }
             </tbody>
         </table>
         <input type="hidden" id="hdnId" name="hdnId" value="" />
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml
@@ -10,7 +10,7 @@
     var hdnId = "";
 
     var widgetId = Request.QueryString["id"];
-    var updateLink = BlogEngine.Core.Utils.RelativeOrAbsoluteWebRoot +
+    var updateLink = BlogEngine.Core.Utils.RelativeWebRoot +
         "Custom/Widgets/LinkList/edit.cshtml?id=" + widgetId;
     var settings = Common.GetSettings(widgetId);
     var linkList = new LinkList(widgetId);
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml
@@ -6,7 +6,7 @@
 <div class="widget linklist">
     <h4 class="widget-header">@Model.Title</h4>
     <div class="widget-content">
-        <ul id="recentComments" class="recentcomments">
+        <ul id="linkList" class="linklist">
         @foreach (var link in links)
         {
             if (link.Target == "on")
diff --git a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js
@@ -35,8 +35,8 @@
     }
 
     $scope.loadEditForm = function (id, name, title, zone) {
-        var sharedSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/common.cshtml";
-        var customSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml";
+        var sharedSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/common.cshtml";
+        var customSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml";
 
         $scope.editId = id;
         $scope.editTitle = title;
diff --git a/BlogEngine/BlogEngine.NET/admin/app/settings/advancedView.html b/BlogEngine/BlogEngine.NET/admin/app/settings/advancedView.html
@@ -67,6 +67,10 @@ <h4>{{lbl.tools}}</h4>
                     <p>{{lbl.exportIntoBlogML}}</p>
                     <button class="btn btn-default" data-ng-click="exportToXml()" type="button">{{lbl.export}}</button>
                 </div>
+                <div class="form-group">
+                    <p>Clear blog cache</p>
+                    <button class="btn btn-default" data-ng-click="clearCache()" type="button">Clear</button>
+                </div>
             </div>
         </div>
     </form>
diff --git a/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js b/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js
@@ -105,6 +105,19 @@
         .error(function () { toastr.error($rootScope.lbl.failed); });
     }
 
+    $scope.clearCache = function () {
+        dataService.updateItem("/api/settings?action=clearCache", $scope.settings)
+        .success(function (data) {
+            if (data) {
+                toastr.error(data);
+            }
+            else {
+                toastr.success($rootScope.lbl.completed);
+            }
+        })
+        .error(function () { toastr.error($rootScope.lbl.failed); });
+    }
+
     $scope.loadTheme = function () {
         var theme = $("#selDesktopTheme option:selected").text();
         window.location.assign("#/shared/package?id=" + theme);

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,13 @@ public override List<BlogRollItem> FillBlogRoll()`
`101`	`101`	`public override void InsertBlogRollItem(BlogRollItem blogRollItem)`
`102`	`102`	`{`
`103`	`103`	`var blogRolls = BlogRollItem.BlogRolls;`
	`104`	`+ if(blogRolls == null)`
	`105`	`+ {`
	`106`	`+ blogRolls = new List<BlogRollItem>();`
	`107`	`+ }`
`104`	`108`	`blogRolls.Add(blogRollItem);`
`105`	`109`
`106`		`- this.WriteBlogRollFile(blogRolls);`
	`110`	`+ WriteBlogRollFile(blogRolls);`
`107`	`111`	`}`
`108`	`112`
`109`	`113`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ public HttpResponseMessage Put([FromBody]Settings settings, string action = "")`
`38`	`38`	`return Request.CreateResponse(HttpStatusCode.OK, retMsg);`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+ else if(action == "clearCache")`
	`42`	`+ {`
	`43`	`+ BlogEngine.Core.Blog.CurrentInstance.Cache.Reset();`
	`44`	`+ }`
`41`	`45`	`else`
`42`	`46`	`{`
`43`	`47`	`repository.Update(settings);`
Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,14 @@ public void Add(NameValueCollection form)`
`128`	`128`	`br.Xfn = GetXfnString(form);`
`129`	`129`
`130`	`130`	`int largestSortIndex = -1;`
`131`		`- foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls)`
	`131`	`+ if(BlogRollItem.BlogRolls != null && BlogRollItem.BlogRolls.Count > 0)`
`132`	`132`	`{`
`133`		`- if (brExisting.SortIndex > largestSortIndex)`
	`133`	`+ foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls)`
`134`	`134`	`{`
`135`		`- largestSortIndex = brExisting.SortIndex;`
	`135`	`+ if (brExisting.SortIndex > largestSortIndex)`
	`136`	`+ {`
	`137`	`+ largestSortIndex = brExisting.SortIndex;`
	`138`	`+ }`
`136`	`139`	`}`
`137`	`140`	`}`
`138`	`141`	`br.SortIndex = largestSortIndex + 1;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`<div class="widget linklist">`
`7`	`7`	`<h4 class="widget-header">@Model.Title</h4>`
`8`	`8`	`<div class="widget-content">`
`9`		`- <ul id="recentComments" class="recentcomments">`
	`9`	`+ <ul id="linkList" class="linklist">`
`10`	`10`	`@foreach (var link in links)`
`11`	`11`	`{`
`12`	`12`	`if (link.Target == "on")`