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

Updated references to the new constants for Application and MediaType aliases.

Browse Source
This commit is contained in:
leekelleher
2013-03-22 13:13:05 +00:00
parent 6b07ee83eb
commit b6ec364156
74 changed files with 190 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
View File

@@ -44,7 +44,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker
//need to add our tree definitions to the collection.
//find the content tree to duplicate
var contentTree = TreeDefinitionCollection.Instance.Single(x => x.Tree.Alias.ToUpper() == "CONTENT");
var contentTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Content, StringComparison.OrdinalIgnoreCase));
var filteredContentTree = new TreeDefinition(typeof(FilteredContentTree),
new umbraco.BusinessLogic.ApplicationTree(true, false, 0,
contentTree.Tree.ApplicationAlias,
@@ -58,7 +58,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker
contentTree.App);
//find the media tree to duplicate
var mediaTree = TreeDefinitionCollection.Instance.Single(x => x.Tree.Alias.ToUpper() == "MEDIA");
var mediaTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Media, StringComparison.OrdinalIgnoreCase));
var filteredMediaTree = new TreeDefinition(typeof(FilteredMediaTree),
new umbraco.BusinessLogic.ApplicationTree(true, false, 0,
mediaTree.Tree.ApplicationAlias,
@@ -83,9 +83,9 @@ namespace umbraco.editorControls.MultiNodeTreePicker
/// </summary>
public MNTP_DataEditor()
{
this.MediaTypesWithThumbnails = new string[] { "image" };
this.MediaTypesWithThumbnails = new string[] { Umbraco.Core.Constants.Conventions.MediaTypes.Image };
ShowThumbnailsForMedia = true;
TreeToRender = "content";
TreeToRender = Umbraco.Core.Constants.Applications.Content;
MaxNodeCount = -1;
MinNodeCount = 0;
StartNodeId = uQuery.RootNodeId;
@@ -295,14 +295,14 @@ namespace umbraco.editorControls.MultiNodeTreePicker
//update the tree type (we need to do this each time because i don't think view state works with these controls)
switch (TreeToRender)
{
case "media":
case Umbraco.Core.Constants.Applications.Media:
TreePickerControl.TreeType = "FilteredMediaTree";
TreePickerControl.App = "media";
TreePickerControl.App = Umbraco.Core.Constants.Applications.Media;
break;
case "content":
case Umbraco.Core.Constants.Applications.Content:
default:
TreePickerControl.TreeType = "FilteredContentTree";
TreePickerControl.App = "content";
TreePickerControl.App = Umbraco.Core.Constants.Applications.Content;
break;
}
@@ -450,8 +450,8 @@ namespace umbraco.editorControls.MultiNodeTreePicker
lnkSelectNode.Attributes["class"] += " noSpr";
}
//show the media preview if media and allowed
if (TreeToRender == "media" && ShowThumbnailsForMedia)
//show the media preview if media and allowed
if (TreeToRender == Umbraco.Core.Constants.Applications.Media && ShowThumbnailsForMedia)
{
var imgPreview = (ImageViewer)e.Item.FindControl("ImgPreview");
//show the thubmnail controls
@@ -466,7 +466,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker
//var inner = (HtmlGenericControl)e.Item.FindControl("InnerItem");
//inner.Style.Add(HtmlTextWriterStyle.Width, "224px");
//check if it's a thumbnail type element, we need to check both schemas
//check if it's a thumbnail type element, we need to check both schemas
if (MediaTypesWithThumbnails.Select(x => x.ToUpper())
.Contains(loadedNode.ContentType.Alias.ToUpper()))
{
@@ -561,7 +561,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker
MaxNodeCount,
tooltipAjaxUrl,
ShowToolTips.ToString().ToLower(),
(TreeToRender == "media" && ShowThumbnailsForMedia).ToString().ToLower(),
(TreeToRender == Umbraco.Core.Constants.Applications.Media && ShowThumbnailsForMedia).ToString().ToLower(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco),
TreeToRender);
var js = "jQuery(window).load(function() { " + jsMethod + " });";

11
src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs
View File

@@ -6,6 +6,7 @@ using System.Web.UI.WebControls;
using umbraco.cms.businesslogic.datatype;
using umbraco.interfaces;
using umbraco.uicontrols.TreePicker;
using Umbraco.Core;
namespace umbraco.editorControls.MultiNodeTreePicker
{
@@ -27,7 +28,7 @@ namespace umbraco.editorControls.MultiNodeTreePicker
{
get
{
return GetPreValue(PropertyIndex.TreeType, x => x.Value, "content");
return GetPreValue(PropertyIndex.TreeType, x => x.Value, Constants.Applications.Content);
}
}
@@ -346,10 +347,10 @@ namespace umbraco.editorControls.MultiNodeTreePicker
switch (SelectedTreeType.ToLower())
{
case "content":
case Constants.Applications.Content:
StartContentNodeIdPicker.Value = StartNodeId.ToString();
break;
case "media":
case Constants.Applications.Media:
default:
StartMediaNodeIdPicker.Value = StartNodeId.ToString();
break;
@@ -371,8 +372,8 @@ namespace umbraco.editorControls.MultiNodeTreePicker
TreeTypeDropDown = new DropDownList { ID = "TreeTypeList" };
TreeTypeDropDown.Items.Add(new ListItem("Content", "content"));
TreeTypeDropDown.Items.Add(new ListItem("Media", "media"));
TreeTypeDropDown.Items.Add(new ListItem("Content", Constants.Applications.Content));
TreeTypeDropDown.Items.Add(new ListItem("Media", Constants.Applications.Media));
TreeTypeDropDown.AutoPostBack = true;
AddPreValueRow(MNTPResources.Lbl_SelectTreeType, "", TreeTypeDropDown);