yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only save container config if provided

Browse Source
This commit is contained in:
AndyButland
2014-07-27 10:35:51 +02:00
parent 332220acc4
commit df04a90698
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
View File

@@ -81,7 +81,7 @@
<asp:CheckBox runat="server" ID="cb_isContainer" Text="Yes" /><br />
</cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_containerConfigPageSize" runat="server" Text="List view page size<br/><small>If selected as a container type the page size is defined here (default if not provided: 10)</small>">
<cc2:PropertyPanel ID="pp_containerConfigPageSize" runat="server" Text="List view page size<br/><small>Number of entries per page if selected for display in list view</small>">
<asp:TextBox ID="txtContainerConfigPageSize" CssClass="guiInputText guiInputStandardSize" runat="server" type="number" min="1" max="100"></asp:TextBox>
</cc2:PropertyPanel>
</cc2:Pane>

21
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -372,18 +372,29 @@ namespace umbraco.controls
/// <returns>Container configuration as JSON string</returns>
private string GetProvidedContainerConfigAsJsonString()
{
var configProvided = false;
int pageSize;
if (!int.TryParse(txtContainerConfigPageSize.Text, out pageSize))
if (int.TryParse(txtContainerConfigPageSize.Text, out pageSize))
{
configProvided = true;
}
else
{
pageSize = 10; // - default page size if none configured
}
var containerConfig = new ContentTypeContainerConfiguration
if (configProvided)
{
PageSize = pageSize,
};
var containerConfig = new ContentTypeContainerConfiguration
{
PageSize = pageSize,
};
return JsonConvert.SerializeObject(containerConfig);
return JsonConvert.SerializeObject(containerConfig);
}
return string.Empty;
}
/// <summary>