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

Fixes: U4-5616 Cannot sort tabs/groups

Browse Source
This commit is contained in:
Shannon
2014-10-14 15:22:28 +11:00
parent 315e9a0d03
commit 4121e3a427
2 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,13 +75,11 @@
<asp:Panel ID="pnlStructure" runat="server"> <asp:Panel ID="pnlStructure" runat="server">
<cc2:Pane ID="Pane6" runat="server"> <cc2:Pane ID="Pane6" runat="server">
<cc2:PropertyPanel ID="pp_Root" runat="server" <cc2:PropertyPanel ID="pp_Root" runat="server">
Text='<%# ui.Text("editcontenttype", "allowAtRoot", Security.CurrentUser) + "<br/><small>" + ui.Text("editcontenttype", "allowAtRootDesc", Security.CurrentUser) + "</small>" %>'>
<asp:CheckBox runat="server" ID="allowAtRoot" Text="Yes" /><br /> <asp:CheckBox runat="server" ID="allowAtRoot" Text="Yes" /><br />
</cc2:PropertyPanel> </cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_isContainer" runat="server" <cc2:PropertyPanel ID="pp_isContainer" runat="server">
Text='<%# ui.Text("editcontenttype", "hasListView", Security.CurrentUser) + "<br/><small>" + ui.Text("editcontenttype", "hasListViewDesc", Security.CurrentUser) + "</small>" %>'>
<asp:CheckBox runat="server" ID="cb_isContainer" Text="Yes" /> <asp:CheckBox runat="server" ID="cb_isContainer" Text="Yes" />
<%if (cb_isContainer.Checked) { %> <%if (cb_isContainer.Checked) { %>

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

@@ -122,7 +122,9 @@ namespace umbraco.controls
pp_compositions.Text = ui.Text("contenttypecompositions", Security.CurrentUser); pp_compositions.Text = ui.Text("contenttypecompositions", Security.CurrentUser);
pp_description.Text = ui.Text("editcontenttype", "description", Security.CurrentUser); pp_description.Text = ui.Text("editcontenttype", "description", Security.CurrentUser);
pp_icon.Text = ui.Text("icon", Security.CurrentUser); pp_icon.Text = ui.Text("icon", Security.CurrentUser);
pp_Root.Text = ui.Text("editcontenttype", "allowAtRoot", Security.CurrentUser) + "<br/><small>" + ui.Text("editcontenttype", "allowAtRootDesc", Security.CurrentUser) + "</small>";
pp_isContainer.Text = ui.Text("editcontenttype", "hasListView", Security.CurrentUser) + "<br/><small>" + ui.Text("editcontenttype", "hasListViewDesc", Security.CurrentUser) + "</small>";
// we'll disable this... // we'll disable this...
if (!Page.IsPostBack && _contentType.MasterContentType != 0) if (!Page.IsPostBack && _contentType.MasterContentType != 0)
{ {
@@ -140,7 +142,6 @@ namespace umbraco.controls
checkTxtAliasJs.Text = string.Format("checkAlias('#{0}');", txtAlias.ClientID); checkTxtAliasJs.Text = string.Format("checkAlias('#{0}');", txtAlias.ClientID);
DataBind();
} }
/// <summary> /// <summary>
@@ -1083,33 +1084,6 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
return !hasAlias; return !hasAlias;
} }
/// <summary>
/// Removes a PropertyType, but when???
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void dgGenericPropertiesOfTab_itemcommand(object sender, DataGridCommandEventArgs e)
{
// Delete propertytype from contenttype
if (e.CommandName == "Delete")
{
int propertyId = int.Parse(e.Item.Cells[0].Text);
string rawName = string.Empty;
var propertyType = _contentType.ContentTypeItem.PropertyTypes.FirstOrDefault(x => x.Id == propertyId);
if (propertyType != null && string.IsNullOrEmpty(propertyType.Alias) == false)
{
rawName = propertyType.Name;
_contentType.ContentTypeItem.RemovePropertyType(propertyType.Alias);
_contentType.Save();
}
RaiseBubbleEvent(new object(), new SaveClickEventArgs("Property ´" + rawName + "´ deleted"));
BindDataGenericProperties(false);
}
}
/// <summary> /// <summary>
/// Called asynchronously in order to delete a content type property /// Called asynchronously in order to delete a content type property
/// </summary> /// </summary>