- Updated DB Dump

- Improved Roles functionality
- Updated the CMS guide

WebApplication/Admin/Controls/Fields/Editor.ascx.cs

@@ -34,6 +34,9 @@ public override object GetValue()
 
         public override void SetValue(object value)
         {
+            if (value == null)
+                value = "";
+
             Instance.Text = value.ToString();
         }
 

WebApplication/Admin/Views/MasterPages/WebService.asmx.cs

@@ -231,9 +231,19 @@ public void GetChildNodes(long id)
 
             if (rootNode != null)
             {
-                var childMediaDetails = MediaDetailsMapper.GetAtleastOneChildByMedia(rootNode.Media, AdminBasePage.CurrentLanguage).Where(i => i.MediaType.ShowInSiteTree).OrderBy(i => i.Media.OrderIndex);
+                IEnumerable<IMediaDetail> childMediaDetails = MediaDetailsMapper.GetAtleastOneChildByMedia(rootNode.Media, AdminBasePage.CurrentLanguage).Where(i => i.MediaType.ShowInSiteTree).OrderBy(i => i.Media.OrderIndex);
                 //var childMediaDetails = BaseMapper.GetDataModel().MediaDetails.Where(i => i.HistoryVersionNumber == 0 && i.Media.ParentMediaID == rootNode.MediaID && i.ID != rootNode.ID && i.MediaType.ShowInSiteTree && i.LanguageID == AdminBasePage.CurrentLanguage.ID).OrderBy(i => i.Media.OrderIndex).ToList();
 
+                childMediaDetails = childMediaDetails.Where(i =>
+                {
+                    if(i.RolesMediaDetails.Count > 0)
+                    {
+                        return FrameworkSettings.CurrentUser.IsInRoles(i.RolesMediaDetails.Select(j => j.Role));
+                    }
+
+                    return true;
+                });
+
                 var jsTreeNodes = childMediaDetails.Select(i => GetJsTreeNode(i));
                 WriteJSON(StringHelper.ObjectToJson(jsTreeNodes));
             }

WebApplication/Admin/Views/PageHandlers/MediaTypes/Detail.aspx

@@ -35,7 +35,7 @@
                         </div>
                         <div>
                             <label for="<%= MasterPageSelector.ClientID %>">
-                                Master Page</label>
+                                Template</label>
                             <Site:MasterPageSelector ID="MasterPageSelector" runat="server" />
                         </div>
                         <div>

WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx

@@ -22,7 +22,7 @@
 
                 <div>
                     <label for="<%= DefaultMasterPageSelector.ClientID %>">
-                        Default Master Page:</label>
+                        Default Template:</label>
                     <div>
                         <asp:DropDownList runat="server" ID="DefaultMasterPageSelector">
                         </asp:DropDownList>

WebApplication/Controls/Generic/GenerateNav.ascx.cs

@@ -292,6 +292,14 @@ public string RootVirtualPath
             }
         }
 
+        public long RootMediaID
+        {
+            set
+            {
+                rootMedia = MediasMapper.GetByID(value);
+            }
+        }
+
         public bool IsBreadCrumbMenu { get; set; }
 
         public Media RootMedia

WebApplication/Web.config

@@ -85,7 +85,7 @@
     <add key="PayPalBuisnessID" value="[GET_IT]" />
     <add key="MailChimpApiKey" value="[GET_IT]" />
     <add key="InstagramClientID" value="69b47bd8e3864ed4b6e933facd10752e" />
-    <add key="EnableInstaller" value="True" />
+    <add key="EnableInstaller" value="False" />
   </appSettings>
   <connectionStrings>
     <add name="Dev" connectionString="Data Source=192.168.121.20;Initial Catalog=FlexDotNetCMS;Integrated Security=False;Persist Security Info=True;User ID=dbuser;Password=dbpassword1234$" providerName="System.Data.SqlClient" />

WebApplication/bin/WebApplication.dll.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=169433