lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Renaud Paquay
2011-06-01 14:39:17 -07:00
parent dda45b654e 7d26298c4a
commit 43b3d45348
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
View File

@@ -142,7 +142,7 @@ namespace Orchard.Tests.DataMigration {
_schemaBuilder
.ExecuteSql("insert into TEST_User VALUES (DEFAULT, DEFAULT)");
// ensure wehave one record woth the default value
// ensure we have one record with the default value
var command = _session.Connection.CreateCommand();
command.CommandText = "SELECT count(*) FROM TEST_User WHERE Lastname = 'Doe'";
Assert.That(command.ExecuteScalar(), Is.EqualTo(1));

9
src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
View File

@@ -120,15 +120,18 @@ namespace Orchard.MultiTenancy.Controllers {
try {
_tenantService.UpdateTenant(
new ShellSettings
{
new ShellSettings {
Name = tenant.Name,
RequestUrlHost = viewModel.RequestUrlHost,
RequestUrlPrefix = viewModel.RequestUrlPrefix,
DataProvider = viewModel.DataProvider,
DataConnectionString = viewModel.DatabaseConnectionString,
DataTablePrefix = viewModel.DatabaseTablePrefix,
State = tenant.State
State = tenant.State,
EncryptionAlgorithm = tenant.EncryptionAlgorithm,
EncryptionKey = tenant.EncryptionKey,
HashAlgorithm = tenant.HashAlgorithm,
HashKey = tenant.HashKey
});
return RedirectToAction("Index");

8
src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs
View File

@@ -86,6 +86,14 @@ namespace Orchard.ContentManagement.MetaData.Builders {
return new ContentPartFieldDefinition(_fieldDefinition, _fieldName, _settings);
}
public override string Name {
get { return _fieldName; }
}
public override string FieldType {
get { return _fieldDefinition.Name; }
}
public override ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition) {
_fieldDefinition = fieldDefinition;
return this;

3
src/Orchard/ContentManagement/MetaData/Builders/ContentPartFieldDefinitionBuilder.cs
View File

@@ -14,6 +14,9 @@ namespace Orchard.ContentManagement.MetaData.Builders {
return this;
}
public abstract string Name { get; }
public abstract string FieldType { get; }
public abstract ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition);
public abstract ContentPartFieldDefinitionBuilder OfType(string fieldType);
}

8
src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs
View File

@@ -26,13 +26,7 @@ namespace Orchard.ContentManagement.MetaData.Services {
var partElement = NewElement(partDefinition.Name, partDefinition.Settings);
foreach(var partField in partDefinition.Fields) {
var attributeName = partField.Name + "." + partField.FieldDefinition.Name;
var fieldSettings = new SettingsDictionary();
foreach (var partFieldSetting in partField.Settings.Keys) {
if (partFieldSetting.StartsWith(partField.FieldDefinition.Name)) {
fieldSettings.Add(partFieldSetting, partField.Settings[partFieldSetting]);
}
}
var partFieldElement = NewElement(attributeName, fieldSettings);
var partFieldElement = NewElement(attributeName, partField.Settings);
partElement.Add(partFieldElement);
}
return partElement;