From 44ce1f4350ae84f586d435c225f4eb6481b198f3 Mon Sep 17 00:00:00 2001 From: GrimaceOfDespair Date: Fri, 4 May 2012 10:51:07 +0200 Subject: [PATCH 1/2] Hide buttons when they are not applicable --- src/Mvc/MvcTemplates/N2/Content/Edit.aspx.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mvc/MvcTemplates/N2/Content/Edit.aspx.cs b/src/Mvc/MvcTemplates/N2/Content/Edit.aspx.cs index 5aea8c2752..50366cccec 100644 --- a/src/Mvc/MvcTemplates/N2/Content/Edit.aspx.cs +++ b/src/Mvc/MvcTemplates/N2/Content/Edit.aspx.cs @@ -85,10 +85,10 @@ private void InitButtons() bool isWritableByUser = Security.IsAuthorized(User, Selection.SelectedItem, Permission.Write); bool isExisting = ie.CurrentItem.ID != 0; - btnSavePublish.Enabled = isPublicableByUser; - btnPreview.Enabled = isVersionable && isWritableByUser; - btnSaveUnpublished.Enabled = isVersionable && isWritableByUser; - hlFuturePublish.Enabled = isVersionable && isPublicableByUser; + btnSavePublish.Visible = isPublicableByUser; + btnPreview.Visible = isVersionable && isWritableByUser; + btnSaveUnpublished.Visible = isVersionable && isWritableByUser; + hlFuturePublish.Visible = isVersionable && isPublicableByUser; } protected override void OnLoad(EventArgs e) From b27377762264cb0c6f878bc1cb586deb04df7251 Mon Sep 17 00:00:00 2001 From: GrimaceOfDespair Date: Fri, 4 May 2012 10:51:45 +0200 Subject: [PATCH 2/2] Do not add zoneName in query when empty, because it causes the zoneName of the created item to be the empty string instead of null --- src/Framework/N2/Edit/EditUrlManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Framework/N2/Edit/EditUrlManager.cs b/src/Framework/N2/Edit/EditUrlManager.cs index d2f64c8f80..835f7e9d99 100644 --- a/src/Framework/N2/Edit/EditUrlManager.cs +++ b/src/Framework/N2/Edit/EditUrlManager.cs @@ -147,7 +147,8 @@ public virtual string GetDeleteUrl(ContentItem selectedItem) Url url = Url.ResolveTokens(EditItemUrl); url = url.AppendQuery(SelectionUtility.SelectedQueryKey, parent.Path); url = url.AppendQuery("discriminator", definition.Discriminator); - url = url.AppendQuery("zoneName", zoneName); + if (!string.IsNullOrEmpty(zoneName)) + url = url.AppendQuery("zoneName", zoneName); if (!string.IsNullOrEmpty(definition.TemplateKey)) url = url.AppendQuery("template", definition.TemplateKey);