From 82c5b91debb8bbdb6c2f34c1ccb4cbaa6dffeb82 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 9 Aug 2016 13:30:19 +0200
Subject: [PATCH 1/2] Fixes: U4-8832 Remove custom styling of pagination on
 list views

---
 .../src/less/listview.less                    | 45 -------------------
 .../propertyeditors/listview/listview.html    | 20 +++++----
 2 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index 88762edf0c..95c8a49b36 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -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 {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 742d1251cb..3969483734 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -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>
 

From 2279e6cc532a3ffb4e22562a96f68f311590db89 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Tue, 9 Aug 2016 13:39:40 +0200
Subject: [PATCH 2/2] U4-8834 Removing code assigning PropertyData IDs for new
 properties even though it isn't used

---
 .../Repositories/VersionableRepositoryBase.cs         | 11 -----------
 .../Models/ContentEditing/ContentPropertyBasic.cs     |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
index 31ac9d9a9e..44e9349de1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
@@ -501,17 +501,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
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
index 942766aa40..f317771333 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
@@ -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; }