Permalink
Browse files

Merge remote branch 'grimace/local_2.3' into uifix

  • Loading branch information...
2 parents 75210c9 + 5a6de2c commit 04c1c6e6012842f3237f9f8fed326ce5bd7fc152 @libardo libardo committed May 5, 2012
Showing with 6 additions and 5 deletions.
  1. +2 −1 src/Framework/N2/Edit/EditUrlManager.cs
  2. +4 −4 src/Mvc/MvcTemplates/N2/Content/Edit.aspx.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);
@@ -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)

0 comments on commit 04c1c6e

Please sign in to comment.