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

n2cms · May 5, 2012 · 04c1c6e · 04c1c6e
2 parents 75210c9 + 5a6de2c
commit 04c1c6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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);
 

diff --git 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)