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

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
perploug
2013-10-11 09:47:57 +02:00
parent 4a6f0a791e 3779ba38cb
commit f95ec4d8f4
11 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs
View File

@@ -15,6 +15,7 @@ namespace Umbraco.Core.Models.Rdbms
[Column("ContentId")]
[ForeignKey(typeof(ContentDto), Column = "nodeId")]
[Index(IndexTypes.NonClustered, Name = "IX_cmsContentVersion_ContentId")]
public int NodeId { get; set; }
[Column("VersionId")]

2
src/Umbraco.Core/Models/Rdbms/DocumentDto.cs
View File

@@ -16,6 +16,7 @@ namespace Umbraco.Core.Models.Rdbms
public int NodeId { get; set; }
[Column("published")]
[Index(IndexTypes.NonClustered, Name = "IX_cmsDocument_published")]
public bool Published { get; set; }
[Column("documentUser")]
@@ -51,6 +52,7 @@ namespace Umbraco.Core.Models.Rdbms
[Column("newest")]
[Constraint(Default = "0")]
[Index(IndexTypes.NonClustered, Name = "IX_cmsDocument_newest")]
public bool Newest { get; set; }
[ResultColumn]

5
src/Umbraco.Core/Models/Rdbms/NodeDto.cs
View File

@@ -15,11 +15,12 @@ namespace Umbraco.Core.Models.Rdbms
[Column("trashed")]
[Constraint(Default = "0")]
[Index(IndexTypes.NonClustered, Name = "IX_umbracoNodeTrashed")]
public bool Trashed { get; set; }
[Column("parentID")]
[ForeignKey(typeof(NodeDto))]
[IndexAttribute(IndexTypes.NonClustered, Name = "IX_umbracoNodeParentId")]
[Index(IndexTypes.NonClustered, Name = "IX_umbracoNodeParentId")]
public int ParentId { get; set; }
[Column("nodeUser")]
@@ -46,7 +47,7 @@ namespace Umbraco.Core.Models.Rdbms
[Column("nodeObjectType")]
[NullSetting(NullSetting = NullSettings.Null)]
[IndexAttribute(IndexTypes.NonClustered, Name = "IX_umbracoNodeObjectType")]
[Index(IndexTypes.NonClustered, Name = "IX_umbracoNodeObjectType")]
public Guid? NodeObjectType { get; set; }
[Column("createDate")]

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Core.Models.Rdbms;
namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
[Migration("7.0.0", 9, GlobalSettings.UmbracoMigrationName)]
[Migration("7.0.0", 8, GlobalSettings.UmbracoMigrationName)]
public class AlterTagRelationsTable : MigrationBase
{
public override void Up()

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs
View File

@@ -4,7 +4,7 @@ using Umbraco.Core.Configuration;
namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
[Migration("7.0.0", 10, GlobalSettings.UmbracoMigrationName)]
[Migration("7.0.0", 9, GlobalSettings.UmbracoMigrationName)]
public class AlterTagsTable : MigrationBase
{
public override void Up()

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs
View File

@@ -3,7 +3,7 @@ using Umbraco.Core.Configuration;
namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
[Migration("7.0.0", 8, GlobalSettings.UmbracoMigrationName)]
[Migration("7.0.0", 7, GlobalSettings.UmbracoMigrationName)]
public class RemoveCmsMacroPropertyTypeTable : MigrationBase
{
public override void Up()

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
View File

@@ -4,7 +4,7 @@ using Umbraco.Core.Models.Rdbms;
namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
{
[Migration("6.2.0", 0, GlobalSettings.UmbracoMigrationName)]
[Migration("6.2.0", 1, GlobalSettings.UmbracoMigrationName)]
public class AddChangeDocumentTypePermission : MigrationBase
{
public override void Up()

22
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using Umbraco.Core.Configuration;
namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
{
[Migration("6.2.0", 0, GlobalSettings.UmbracoMigrationName)]
public class AdditionalIndexesAndKeys : MigrationBase
{
public override void Up()
{
Create.Index("IX_umbracoNodeTrashed").OnTable("umbracoNode").OnColumn("trashed").Ascending().WithOptions().NonClustered();
Create.Index("IX_cmsContentVersion_ContentId").OnTable("cmsContentVersion").OnColumn("ContentId").Ascending().WithOptions().NonClustered();
Create.Index("IX_cmsDocument_published").OnTable("cmsDocument").OnColumn("published").Ascending().WithOptions().NonClustered();
Create.Index("IX_cmsDocument_newest").OnTable("cmsDocument").OnColumn("newest").Ascending().WithOptions().NonClustered();
}
public override void Down()
{
throw new NotImplementedException();
}
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -433,6 +433,7 @@
<Compile Include="Persistence\FaultHandling\Strategies\SqlAzureTransientErrorDetectionStrategy.cs" />
<Compile Include="Persistence\FaultHandling\ThrottlingCondition.cs" />
<Compile Include="Persistence\Mappers\MacroMapper.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSixTwoZero\AdditionalIndexesAndKeys.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSeven\AlterCmsMacroPropertyTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSeven\AddIndexToCmsMacroPropertyTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSeven\AddIndexToCmsMacroTable.cs" />

30
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
View File

@@ -2,6 +2,10 @@
.controller("Umbraco.PropertyEditors.RelatedLinksController",
function ($rootScope, $scope, dialogService) {
if (!$scope.model.value) {
$scope.model.value = [];
}
$scope.newCaption = '';
$scope.newLink = 'http://';
$scope.newNewWindow = false;
@@ -9,11 +13,11 @@
$scope.newInternalName = '';
$scope.addExternal = true;
$scope.relatedLinks = [
{ caption: 'Google', link: "http://google.com", newWindow: false, edit:false },
{ caption: 'Umbraco', link: "http://umbraco.com", newWindow: false, edit: false },
{ caption: 'Nibble', link: "http://nibble.be", newWindow: false, edit: false }
];
//$scope.relatedLinks = [
// { caption: 'Google', link: "http://google.com", newWindow: false, edit:false },
// { caption: 'Umbraco', link: "http://umbraco.com", newWindow: false, edit: false },
// { caption: 'Nibble', link: "http://nibble.be", newWindow: false, edit: false }
//];
$scope.internal = function ($event) {
var d = dialogService.contentPicker({ scope: $scope, multipicker: false, callback: select });
@@ -22,19 +26,19 @@
};
$scope.edit = function (idx) {
for (var i = 0; i < $scope.relatedLinks.length; i++) {
$scope.relatedLinks[i].edit = false;
for (var i = 0; i < $scope.model.value.length; i++) {
$scope.model.value[i].edit = false;
}
$scope.relatedLinks[idx].edit = true;
$scope.model.value[idx].edit = true;
};
$scope.cancelEdit = function(idx) {
$scope.relatedLinks[idx].edit = false;
$scope.model.value[idx].edit = false;
};
$scope.delete = function (idx) {
$scope.relatedLinks.splice($scope.relatedLinks[idx], 1);
$scope.model.value.splice($scope.model.value[idx], 1);
};
@@ -45,16 +49,18 @@
this.caption = $scope.newCaption;
this.link = $scope.newLink;
this.newWindow = $scope.newNewWindow;
this.edit = false;
};
$scope.relatedLinks.push(newExtLink);
$scope.model.value.push(newExtLink);
} else {
var newIntLink = new function () {
this.caption = $scope.newCaption;
this.link = $scope.newLink;
this.newWindow = $scope.newNewWindow;
this.internal = $scope.newInternal;
this.edit = false;
};
$scope.relatedLinks.push(newIntLink);
$scope.model.value.push(newIntLink);
}
$scope.newCaption = '';
$scope.newLink = 'http://';

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
View File

@@ -10,7 +10,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="link in relatedLinks">
<tr ng-repeat="link in $scope.model.value">
<td>
<span ng-show="!link.edit">{{link.caption}}</span>
<input type="text" ng-model="link.caption" ng-show="link.edit"/>