mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Using IsInstanceOfType instead of IsAssignableFrom
--HG-- branch : 1.x
This commit is contained in:
@@ -31,13 +31,13 @@ namespace Orchard.ContentManagement {
|
|||||||
public IContentManager ContentManager { get; set; }
|
public IContentManager ContentManager { get; set; }
|
||||||
|
|
||||||
public bool Has(Type partType) {
|
public bool Has(Type partType) {
|
||||||
return partType == typeof(ContentItem) || _parts.Any(part => partType.IsAssignableFrom(part.GetType()));
|
return partType == typeof(ContentItem) || _parts.Any(partType.IsInstanceOfType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IContent Get(Type partType) {
|
public IContent Get(Type partType) {
|
||||||
if (partType == typeof(ContentItem))
|
if (partType == typeof(ContentItem))
|
||||||
return this;
|
return this;
|
||||||
return _parts.FirstOrDefault(part => partType.IsAssignableFrom(part.GetType()));
|
return _parts.FirstOrDefault(partType.IsInstanceOfType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Weld(ContentPart part) {
|
public void Weld(ContentPart part) {
|
||||||
|
|||||||
@@ -54,11 +54,11 @@ namespace Orchard.ContentManagement {
|
|||||||
|
|
||||||
|
|
||||||
public bool Has(Type fieldType, string fieldName) {
|
public bool Has(Type fieldType, string fieldName) {
|
||||||
return _fields.Any(field => fieldType.IsAssignableFrom(field.GetType()) && field.Name == fieldName);
|
return _fields.Any(field => fieldType.IsInstanceOfType(field) && field.Name == fieldName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContentField Get(Type fieldType, string fieldName) {
|
public ContentField Get(Type fieldType, string fieldName) {
|
||||||
return _fields.FirstOrDefault(field => fieldType.IsAssignableFrom(field.GetType()) && field.Name == fieldName);
|
return _fields.FirstOrDefault(field => fieldType.IsInstanceOfType(field) && field.Name == fieldName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Weld(ContentField field) {
|
public void Weld(ContentField field) {
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ namespace Orchard.Data.Migration.Generator {
|
|||||||
|
|
||||||
foreach(var table in tables.Where(t => parameters.RecordDescriptors.Any(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == t.Name))) {
|
foreach(var table in tables.Where(t => parameters.RecordDescriptors.Any(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == t.Name))) {
|
||||||
string tableName = table.Name;
|
string tableName = table.Name;
|
||||||
var recordType = parameters.RecordDescriptors.Where(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == tableName).First().Type;
|
var recordType = parameters.RecordDescriptors.First(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == tableName).Type;
|
||||||
var isContentPart = typeof(ContentPartRecord).IsAssignableFrom(recordType);
|
var isContentPart = typeof(ContentPartRecord).IsAssignableFrom(recordType);
|
||||||
|
|
||||||
if ( tableName.StartsWith(prefix) ) {
|
if ( tableName.StartsWith(prefix) ) {
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ namespace Orchard.Environment {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (destinationType.IsAssignableFrom(value.GetType())) {
|
if (destinationType.IsInstanceOfType(value)) {
|
||||||
result = value;
|
result = value;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user