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

Work items: 30660

Browse Source
This commit is contained in:
hartvig
2012-01-06 08:32:50 -01:00
parent c9160dfdda
commit 39f3c377be
9 changed files with 62 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
umbraco/presentation/App_Data/Umbraco.sdf
View File

Binary file not shown.

18
umbraco/presentation/config/Dashboard.config
View File

@@ -55,11 +55,7 @@
</control>
<control showOnce="true" addPanel="true" panelCaption="">
/umbraco/dashboard/startupdashboardkits.ascx
<access>
<deny>editor</deny>
<deny>writer</deny>
</access>
</control>
<access><deny>editor</deny><deny>writer</deny></access></control>
<control showOnce="true" addPanel="true" panelCaption="">
/umbraco/dashboard/startupdashboardvideos.ascx
</control>
@@ -103,4 +99,16 @@
<control>/umbraco/plugins/uGoLive/Dashboard.ascx</control>
</tab>
</section>
<section alias="MyDashboardSection">
<areas>
<area>default</area>
<area>content</area>
</areas>
<tab caption="Contact Logs">
<control>/usercontrols/dashboards/ContactForm_logs.ascx</control>
</tab>
<tab caption="Email a Friend Logs">
<control>/usercontrols/dashboards/EmailAFriendForm_logs.ascx</control>
</tab>
</section>
</dashBoard>

1
umbraco/presentation/config/UrlRewriting.config
View File

@@ -30,5 +30,6 @@
-->
<add name="CWS_emaiAFriendID" virtualUrl="^~/email-a-friend/(.[0-9]*).aspx" rewriteUrlParameter="ExcludeFromClientQueryString" destinationUrl="~/email-a-friend.aspx?nodeID=$1" ignoreCase="true" />
<add name="CWS_emaiAFriendID" virtualUrl="^~/email-a-friend/(.[0-9]*).aspx" rewriteUrlParameter="ExcludeFromClientQueryString" destinationUrl="~/email-a-friend.aspx?nodeID=$1" ignoreCase="true" />
<add name="CWS_emaiAFriendID" virtualUrl="^~/email-a-friend/(.[0-9]*).aspx" rewriteUrlParameter="ExcludeFromClientQueryString" destinationUrl="~/email-a-friend.aspx?nodeID=$1" ignoreCase="true" />
</rewrites>
</urlrewritingnet>

2
umbraco/presentation/config/metablogConfig.config
View File

@@ -5,7 +5,7 @@
<user>0</user>
<startNode>1080</startNode>
<fullTree>False</fullTree>
<documentTypeAlias>umbBlog</documentTypeAlias>
<documentTypeAlias>Base</documentTypeAlias>
<fields>
<categories>
</categories>

4
umbraco/presentation/config/restExtensions.config
View File

@@ -10,8 +10,4 @@
<permission method="setProperty" allowAll="false" />
</ext>
-->
<ext assembly="Runway.Blog" type="Runway.Blog.Library.Base" alias="umbBlog">
<permission method="CreateComment" returnXml="false" allowAll="true" />
<permission method="GetGravatarImage" returnXml="false" allowAll="true" />
</ext>
</RestExtensions>

2
umbraco/presentation/config/xsltExtensions.config
View File

@@ -2,6 +2,4 @@
<XsltExtensions>
<!-- <ext assembly="your.assemblyName" type="your.class.name" alias="yourAlias">
</ext> -->
<ext assembly="umbraco.editorControls" type="umbraco.editorControls.tags.library" alias="tagsLib">
</ext>
</XsltExtensions>

77
umbraco/presentation/macro.cs
View File

@@ -232,29 +232,29 @@ namespace umbraco
string GetCacheIdentifier(MacroModel model, Hashtable pageElements, int pageId)
{
StringBuilder id = new StringBuilder();
StringBuilder id = new StringBuilder();
var alias = string.IsNullOrEmpty(model.ScriptCode) ? model.Alias : Macro.GenerateCacheKeyFromCode(model.ScriptCode);
id.AppendFormat("{0}-", alias);
var alias = string.IsNullOrEmpty(model.ScriptCode) ? model.Alias : Macro.GenerateCacheKeyFromCode(model.ScriptCode);
id.AppendFormat("{0}-", alias);
if (CacheByPage)
{
id.AppendFormat("{0}-", pageId);
id.AppendFormat("{0}-", pageId);
}
if (CacheByPersonalization)
{
var currentMember = Member.GetCurrentMember();
id.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
var currentMember = Member.GetCurrentMember();
id.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
}
foreach (MacroPropertyModel prop in model.Properties)
foreach (MacroPropertyModel prop in model.Properties)
{
var propValue = prop.Value;
id.AppendFormat("{0}-", propValue.Length <= 255 ? propValue : propValue.Substring(0, 255));
id.AppendFormat("{0}-", propValue.Length <= 255 ? propValue : propValue.Substring(0, 255));
}
return id.ToString();
return id.ToString();
}
public Control renderMacro(Hashtable attributes, Hashtable pageElements, int pageId)
@@ -291,20 +291,20 @@ namespace umbraco
if (!String.IsNullOrEmpty(macroHtml))
{
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Content loaded from cache '{0}'.", Model.CacheIdentifier));
string.Format("Macro Content loaded from cache '{0}'.", Model.CacheIdentifier));
}
}
else
{
var cacheContent = macroCache["macroControl_" + Model.CacheIdentifier] as MacroCacheContent;
var cacheContent = macroCache["macroControl_" + Model.CacheIdentifier] as MacroCacheContent;
if (cacheContent != null)
if (cacheContent != null)
{
macroControl = cacheContent.Content;
macroControl.ID = cacheContent.ID;
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Control loaded from cache '{0}'.", Model.CacheIdentifier));
string.Format("Macro Control loaded from cache '{0}'.", Model.CacheIdentifier));
}
}
}
@@ -440,9 +440,9 @@ namespace umbraco
if (!(macroControl is LiteralControl))
macroControl = new LiteralControl(sw.ToString());
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Content saved to cache '{0}'.", Model.CacheIdentifier));
}
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Content saved to cache '{0}'.", Model.CacheIdentifier));
}
}
else
{
@@ -452,9 +452,9 @@ namespace umbraco
CacheItemPriority.Low,
null);
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Control saved to cache '{0}'.", Model.CacheIdentifier));
}
UmbracoContext.Current.Trace.Write("renderMacro",
string.Format("Macro Control saved to cache '{0}'.", Model.CacheIdentifier));
}
}
}
}
@@ -1122,9 +1122,13 @@ namespace umbraco
}
object propValue = mp.Value;
bool propValueSet = false;
// Special case for types of webControls.unit
if (prop.PropertyType == typeof(Unit))
{
propValue = Unit.Parse(propValue.ToString());
propValueSet = true;
}
else
{
try
@@ -1144,6 +1148,8 @@ namespace umbraco
propValue = parseResult;
else
propValue = false;
propValueSet = true;
}
else
{
@@ -1154,26 +1160,29 @@ namespace umbraco
try
{
propValue = Convert.ChangeType(propValue, st);
propValueSet = true;
}
catch (FormatException)
{
propValue = Convert.ChangeType(propValue, propType);
propValueSet = true;
}
}
else
/* NH 06-01-2012: Remove the lines below as they would only get activated if the values are empty
else
{
if (propType != null)
{
if (propType != null)
if (propType.IsValueType)
{
if (propType.IsValueType)
{
propValue = Activator.CreateInstance(propType);
}
else
{
propValue = null;
}
propValue = Activator.CreateInstance(propType);
}
else
{
propValue = null;
}
}
}*/
}
if (GlobalSettings.DebugMode)
@@ -1194,7 +1203,9 @@ namespace umbraco
}
}
prop.SetValue(control, Convert.ChangeType(propValue, prop.PropertyType), null);
// NH 06-01-2012: Only set value if it has content
if (propValueSet)
prop.SetValue(control, Convert.ChangeType(propValue, prop.PropertyType), null);
}
}
@@ -1481,7 +1492,7 @@ namespace umbraco
value = reader.GetString(columnName);
return true;
}
value = string.Empty;
return false;
}
@@ -1494,7 +1505,7 @@ namespace umbraco
value = reader.GetInt(columnName);
return true;
}
value = -1;
return false;
}
@@ -1507,7 +1518,7 @@ namespace umbraco
value = reader.GetBoolean(columnName);
return true;
}
value = false;
return false;
}

4
umbraco/presentation/web.config
View File

@@ -39,8 +39,8 @@
<Examine configSource="config\ExamineSettings.config" />
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
<appSettings>
<add key="umbracoDbDSN" value="server=ssaodev2;database=udev;user id=dev;password=dev" />
<add key="umbracoConfigurationStatus" value="4.7.0" />
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=v47;integrated security=false;user id=DBUSER;password=DBPASSWORD" />
<add key="umbracoConfigurationStatus" value="4.7.1.1" />
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" />

2
umbraco/presentation/web.config.UMBRACOHUMMER.xslt
View File

@@ -8,7 +8,7 @@
</xsl:template>
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
<xsl:attribute name="value">4.7.0</xsl:attribute>
<xsl:attribute name="value">4.7.1</xsl:attribute>
</xsl:template>
<!-- Default templates to match anything else -->