Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7
This commit is contained in:
@@ -507,17 +507,6 @@ WHERE EXISTS(
|
||||
var propertyFactory = new PropertyFactory(compositionProperties, def.Version, def.Id, def.CreateDate, def.VersionDate);
|
||||
var properties = propertyFactory.BuildEntity(propertyDataDtos.ToArray()).ToArray();
|
||||
|
||||
var newProperties = properties.Where(x => x.HasIdentity == false && x.PropertyType.HasIdentity);
|
||||
|
||||
foreach (var property in newProperties)
|
||||
{
|
||||
var propertyDataDto = new PropertyDataDto { NodeId = def.Id, PropertyTypeId = property.PropertyTypeId, VersionId = def.Version };
|
||||
int primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
|
||||
|
||||
property.Version = def.Version;
|
||||
property.Id = primaryKey;
|
||||
}
|
||||
|
||||
foreach (var property in properties)
|
||||
{
|
||||
//NOTE: The benchmarks run with and without the following code show very little change so this is not a perf bottleneck
|
||||
|
||||
@@ -166,51 +166,6 @@
|
||||
background: none
|
||||
}
|
||||
|
||||
.umb-listview .pagination {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.umb-listview .table th {
|
||||
font-weight: normal
|
||||
}
|
||||
|
||||
.umb-listview .showing {
|
||||
padding: 8px 4px 2px 4px;
|
||||
background: none;
|
||||
font-size: 11px;
|
||||
color: #b0b0b0
|
||||
}
|
||||
|
||||
.umb-listview .pagination {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.umb-listview .pagination ul {
|
||||
-webkit-border-radius: 0px;
|
||||
-moz-border-radius: 0px;
|
||||
border-radius: 0px;
|
||||
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0);
|
||||
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0);
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0);
|
||||
background: none
|
||||
}
|
||||
|
||||
.umb-listview .pagination ul > li > a, .pagination ul > li > span {
|
||||
border:none;
|
||||
padding: 8px 4px 2px 4px;
|
||||
background: none;
|
||||
font-size: 12px;
|
||||
color: #b0b0b0
|
||||
}
|
||||
|
||||
.umb-listview .pagination ul > li.active > a, .umb-listview .pagination ul > li > a:hover {
|
||||
color: @black;
|
||||
}
|
||||
|
||||
.umb-listview .pagination ul > li.disabled > a, .umb-listview .pagination ul > li.disabled > a:hover {
|
||||
color: @grayLight;
|
||||
}
|
||||
|
||||
/* TEMP */
|
||||
|
||||
.umb-listview .table-striped tbody td {
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
ng-if="options.allowBulkDelete && (buttonPermissions == null || buttonPermissions.canDelete)"
|
||||
type="button"
|
||||
button-style="link"
|
||||
label="Delete"
|
||||
label="Delete"
|
||||
label-key="actions_delete"
|
||||
icon="icon-trash"
|
||||
action="delete()"
|
||||
@@ -162,14 +162,16 @@
|
||||
|
||||
<umb-load-indicator ng-show="!viewLoaded"></umb-load-indicator>
|
||||
|
||||
<umb-pagination
|
||||
ng-if="listViewResultSet.totalPages"
|
||||
page-number="options.pageNumber"
|
||||
total-pages="listViewResultSet.totalPages"
|
||||
on-next="next"
|
||||
on-prev="prev"
|
||||
on-go-to-page="goToPage">
|
||||
</umb-pagination>
|
||||
<div class="flex justify-center">
|
||||
<umb-pagination
|
||||
ng-if="listViewResultSet.totalPages"
|
||||
page-number="options.pageNumber"
|
||||
total-pages="listViewResultSet.totalPages"
|
||||
on-next="next"
|
||||
on-prev="prev"
|
||||
on-go-to-page="goToPage">
|
||||
</umb-pagination>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -10,6 +10,12 @@ namespace Umbraco.Web.Models.ContentEditing
|
||||
[DataContract(Name = "property", Namespace = "")]
|
||||
public class ContentPropertyBasic
|
||||
{
|
||||
/// <summary>
|
||||
/// This is the cmsPropertyData ID
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This is not really used for anything
|
||||
/// </remarks>
|
||||
[DataMember(Name = "id", IsRequired = true)]
|
||||
[Required]
|
||||
public int Id { get; set; }
|
||||
|
||||
Reference in New Issue
Block a user