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

DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
More tweaks around the package upgrader

[TFS Changeset #56559]
This commit is contained in:
slace
2009-07-16 00:12:33 +00:00
parent 7dbe73c15d
commit a5ba5ef1db
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
umbraco/cms/businesslogic/Packager/Installer.cs
View File

@@ -54,11 +54,11 @@ namespace umbraco.cms.businesslogic.packager
private bool _containUnsecureFiles = false;
private List<string> _unsecureFiles = new List<string>();
private bool _containsMacroConflict = false;
private List<string> _conflictingMacroAliases = new List<string>();
private Dictionary<string, string> _conflictingMacroAliases = new Dictionary<string, string>();
private bool _containsTemplateConflict = false;
private List<string> _conflictingTemplateAliases = new List<string>();
private Dictionary<string, string> _conflictingTemplateAliases = new Dictionary<string, string>();
private bool _containsStyleSheetConflict = false;
private List<string> _conflictingStyleSheetNames = new List<string>();
private Dictionary<string, string> _conflictingStyleSheetNames = new Dictionary<string, string>();
private ArrayList _macros = new ArrayList();
private XmlDocument _packageConfig;
@@ -74,16 +74,16 @@ namespace umbraco.cms.businesslogic.packager
public string Control { get { return _control; } }
public bool ContainsMacroConflict { get { return _containsMacroConflict; } }
public IEnumerable<string> ConflictingMacroAliases { get { return _conflictingMacroAliases; } }
public IDictionary<string, string> ConflictingMacroAliases { get { return _conflictingMacroAliases; } }
public bool ContainsUnsecureFiles { get { return _containUnsecureFiles; } }
public List<string> UnsecureFiles { get { return _unsecureFiles; } }
public bool ContainsTemplateConflicts { get { return _containsTemplateConflict; } }
public IEnumerable<string> ConflictingTemplateAliases { get { return _conflictingTemplateAliases; } }
public IDictionary<string, string> ConflictingTemplateAliases { get { return _conflictingTemplateAliases; } }
public bool ContainsStyleSheeConflicts { get { return _containsStyleSheetConflict; } }
public IEnumerable<string> ConflictingStyleSheetNames { get { return _conflictingStyleSheetNames; } }
public IDictionary<string, string> ConflictingStyleSheetNames { get { return _conflictingStyleSheetNames; } }
public int RequirementsMajor { get { return _reqMajor; } }
public int RequirementsMinor { get { return _reqMinor; } }
@@ -868,7 +868,7 @@ namespace umbraco.cms.businesslogic.packager
{
var m = new Macro(alias);
this._containsMacroConflict = true;
this._conflictingMacroAliases.Add(alias);
this._conflictingMacroAliases.Add(m.Name, alias);
}
catch (IndexOutOfRangeException) { } //thrown when the alias doesn't exist in the DB, ie - macro not there
}
@@ -879,10 +879,11 @@ namespace umbraco.cms.businesslogic.packager
var alias = n.SelectSingleNode("Alias").InnerText;
if (!string.IsNullOrEmpty(alias))
{
if (Template.GetByAlias(alias) != null)
var t = Template.GetByAlias(alias);
if (t != null)
{
this._containsTemplateConflict = true;
this._conflictingTemplateAliases.Add(alias);
this._conflictingTemplateAliases.Add(t.Text, alias);
}
}
}
@@ -892,10 +893,11 @@ namespace umbraco.cms.businesslogic.packager
var alias = n.SelectSingleNode("Name").InnerText;
if (!string.IsNullOrEmpty(alias))
{
if (StyleSheet.GetByName(alias) != null)
var s = StyleSheet.GetByName(alias);
if (s != null)
{
this._containsStyleSheetConflict = true;
this._conflictingStyleSheetNames.Add(alias);
this._conflictingStyleSheetNames.Add(s.Text, alias);
}
}
}

2
umbraco/cms/businesslogic/web/StyleSheet.cs
View File

@@ -450,7 +450,7 @@ namespace umbraco.cms.businesslogic.web
foreach (XmlNode prop in n.SelectNodes("Properties/Property"))
{
string alias = xmlHelper.GetNodeValue(prop.SelectSingleNode("Alias"));
var sp = s.Properties.SingleOrDefault(p => p.Alias == alias);
var sp = s.Properties.SingleOrDefault(p => p != null && p.Alias == alias);
string name = xmlHelper.GetNodeValue(prop.SelectSingleNode("Name"));
if (sp == default(StylesheetProperty))
{

12
umbraco/presentation/umbraco/developer/Packages/installer.aspx.cs
View File

@@ -157,27 +157,27 @@ namespace umbraco.presentation.developer.packages
if (p.ContainsMacroConflict)
{
pp_macroConflicts.Visible = true;
foreach (var alias in p.ConflictingMacroAliases)
foreach (var item in p.ConflictingMacroAliases)
{
ltrMacroAlias.Text += "<li>" + alias + "</li>";
ltrMacroAlias.Text += "<li>" + item.Key + " (Alias: " + item.Value + ")</li>";
}
}
if (p.ContainsTemplateConflicts)
{
pp_templateConflicts.Visible = true;
foreach (var alias in p.ConflictingTemplateAliases)
foreach (var item in p.ConflictingTemplateAliases)
{
ltrTemplateAlias.Text += "<li>" + alias + "</li>";
ltrTemplateAlias.Text += "<li>" + item.Key + " (Alias: " + item.Value + ")</li>";
}
}
if (p.ContainsStyleSheeConflicts)
{
pp_stylesheetConflicts.Visible = true;
foreach (var alias in p.ConflictingStyleSheetNames)
foreach (var item in p.ConflictingStyleSheetNames)
{
ltrStylesheetNames.Text += "<li>" + alias + "</li>";
ltrStylesheetNames.Text += "<li>" + item.Key + " (Alias: " + item.Value + ")</li>";
}
}