From c1cfcaf9eaf8f11f351fa0bc05ee8527b5c7482a Mon Sep 17 00:00:00 2001
From: Michiel van Oosterhout <michielvoo@gmail.com>
Date: Sat, 6 Oct 2012 20:51:00 -0200
Subject: [PATCH] Deprecated MacroProperty.Public because its value is ignored.
 Removed the checkbox for setting MacroProperty.Public from the macro editor.

---
 .../umbraco/developer/Macros/editMacro.aspx         | 13 ++-----------
 .../umbraco/developer/Macros/editMacro.aspx         |  9 ---------
 .../umbraco/developer/Macros/editMacro.aspx.cs      |  4 +---
 .../businesslogic/macro/MacroProperty.cs            |  1 +
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
index 46b066cbf1..b696c6d594 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
@@ -136,9 +136,6 @@
             <HeaderTemplate>
                 <table cellspacing="0" cellpadding="2" width="98%" border="0">
                     <tr>
-                        <td class="propertyHeader">
-                            <%=umbraco.ui.Text("show",this.getUser())%>
-                        </td>
                         <td class="propertyHeader">
                             <%=umbraco.ui.Text("general", "alias",this.getUser())%>
                         </td>
@@ -153,9 +150,6 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHidden" Checked='<%# macroIsVisible (DataBinder.Eval(Container.DataItem, "Public"))%>' />
-                    </td>
                     <td class="propertyContent">
                         <input type="hidden" id="macroPropertyID" runat="server" value='<%#DataBinder.Eval(Container.DataItem, "id")%>'
                             name="macroPropertyID" />
@@ -179,13 +173,10 @@
             <FooterTemplate>
                 <tr>
                     <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHiddenNew" />
+                        <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='' OnTextChanged="macroPropertyCreate" />
                     </td>
                     <td class="propertyContent">
-                        <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='New Alias' OnTextChanged="macroPropertyCreate" />
-                    </td>
-                    <td class="propertyContent">
-                        <asp:TextBox runat="server" ID="macroPropertyNameNew" Text='New Name' />
+                        <asp:TextBox runat="server" ID="macroPropertyNameNew" Text='' />
                     </td>
                     <td class="propertyContent">
                         <asp:DropDownList OnPreRender="AddChooseList" runat="server" ID="macroPropertyTypeNew"
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx
index 46b066cbf1..2510cb45b2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx
@@ -136,9 +136,6 @@
             <HeaderTemplate>
                 <table cellspacing="0" cellpadding="2" width="98%" border="0">
                     <tr>
-                        <td class="propertyHeader">
-                            <%=umbraco.ui.Text("show",this.getUser())%>
-                        </td>
                         <td class="propertyHeader">
                             <%=umbraco.ui.Text("general", "alias",this.getUser())%>
                         </td>
@@ -153,9 +150,6 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHidden" Checked='<%# macroIsVisible (DataBinder.Eval(Container.DataItem, "Public"))%>' />
-                    </td>
                     <td class="propertyContent">
                         <input type="hidden" id="macroPropertyID" runat="server" value='<%#DataBinder.Eval(Container.DataItem, "id")%>'
                             name="macroPropertyID" />
@@ -178,9 +172,6 @@
             </ItemTemplate>
             <FooterTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHiddenNew" />
-                    </td>
                     <td class="propertyContent">
                         <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='New Alias' OnTextChanged="macroPropertyCreate" />
                     </td>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
index f20ce88607..f98e10f1d5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
@@ -136,7 +136,6 @@ namespace umbraco.cms.presentation.developer
                     DropDownList macroElementType = (DropDownList)item.FindControl("macroPropertyType");
 
                     MacroProperty mp = new MacroProperty(int.Parse(macroPropertyID.Value));
-                    mp.Public = macroElementShow.Checked;
                     mp.Type = new MacroPropertyType(int.Parse(macroElementType.SelectedValue));
                     mp.Alias = macroElementAlias.Text;
                     mp.Name = macroElementName.Text;
@@ -253,7 +252,6 @@ namespace umbraco.cms.presentation.developer
 
         public void macroPropertyCreate(object sender, EventArgs e)
         {
-            CheckBox macroPropertyHiddenNew = (CheckBox)((Control)sender).Parent.FindControl("macroPropertyHiddenNew");
             TextBox macroPropertyAliasNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyAliasNew");
             TextBox macroPropertyNameNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyNameNew");
             DropDownList macroPropertyTypeNew = (DropDownList)((Control)sender).Parent.FindControl("macroPropertyTypeNew");
@@ -277,7 +275,7 @@ namespace umbraco.cms.presentation.developer
                 {
                     MacroProperty mp = new MacroProperty();
                     mp.Macro = m_macro;
-                    mp.Public = macroPropertyHiddenNew.Checked;
+                    mp.Public = true;
                     mp.Type = new MacroPropertyType(int.Parse(macroPropertyTypeNew.SelectedValue));
                     mp.Alias = macroPropertyAliasNew.Text;
                     mp.Name = macroPropertyNameNew.Text;
diff --git a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
index 681ea158bd..7316c86c66 100644
--- a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
+++ b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
@@ -65,6 +65,7 @@ namespace umbraco.cms.businesslogic.macro
         /// 
         /// If not, the field can be manipulated by a default value given by the MacroPropertyType, this is s
         /// </summary>
+        [Obsolete]
         public bool Public
         {
             get { return _public; }