Merge pull request #104 from valadas/Issue80

Fixed an issue where it was impossible to exit list view mode
DNNCommunity · Jul 12, 2018 · 7f16f44 · 7f16f44
2 parents 5e55a37 + 1980e87
commit 7f16f44
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/EventList.ascx.cs b/EventList.ascx.cs
@@ -361,24 +361,28 @@ public void gvEvents_RowCreated(object sender, GridViewRowEventArgs e)
         {
             if (e.Row.RowType == DataControlRowType.DataRow)
             {
-                if (this.Settings.Eventtooltiplist)
-                {
-                    var tooltip = Convert.ToString(DataBinder.Eval(e.Row.DataItem, "Tooltip"));
-                    e.Row.Attributes.Add("title", tooltip);
-                }
-                var backColor = (Color) DataBinder.Eval(e.Row.DataItem, "CategoryColor");
-                if (backColor.Name != "0")
+                var eventListObject = e.Row.DataItem as EventListObject;
+                if (eventListObject != null)
                 {
-                    for (var i = 0; i <= e.Row.Cells.Count - 1; i++)
+                    if (this.Settings.Eventtooltiplist && !string.IsNullOrEmpty(eventListObject.Tooltip))
+                    {
+                        var tooltip = eventListObject.Tooltip;
+                        e.Row.Attributes.Add("title", tooltip);
+                    }
+                    var backColor = eventListObject.CategoryColor;
+                    if (backColor.Name != "0")
                     {
-                        if (e.Row.Cells[i].Visible && !(this.gvEvents.Columns[i].SortExpression == "Description"))
+                        for (var i = 0; i <= e.Row.Cells.Count - 1; i++)
                         {
-                            e.Row.Cells[i].BackColor = backColor;
+                            if (e.Row.Cells[i].Visible && !(this.gvEvents.Columns[i].SortExpression == "Description"))
+                            {
+                                e.Row.Cells[i].BackColor = backColor;
+                            }
                         }
                     }
                 }
                 if (this.IsPrivateNotModerator &&
-                    !(this.UserId == Convert.ToInt32(DataBinder.Eval(e.Row.DataItem, "OwnerID"))))
+                    !(this.UserId == eventListObject.OwnerID))
                 {
                     var lnkevent = (HyperLink) e.Row.FindControl("lnkEvent");
                     lnkevent.Style.Add("cursor", "text");

diff --git a/Installation/ReleaseNotes/Release.07.00.02.txt b/Installation/ReleaseNotes/Release.07.00.02.txt
@@ -7,4 +7,5 @@
 	<li>Fixed an issue where it was impossible to create an event if the edit interval was set to 1440</li>
 	<li>Fixed an issue where it was impossible to view events after changing months when categories where enabled but none selected</li>
 	<li>Fixed an issue where it was impossible to view events after changing months when locations where enabled but none selected</li>
+	<li>Fixed an issue where it was impossible to exit list view mode</li>
 </ul>