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

Make fixes based on Shan's review notes

Browse Source
This commit is contained in:
Warren Buckley
2019-11-13 14:35:13 +00:00
parent 411bf067e5
commit 2314b4de5e
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.UI.Client/src/common/resources/relationtype.resource.js
View File

@@ -118,13 +118,9 @@ function relationTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
getPagedResults: function (id, options) {
console.log('options in', options);
var defaults = {
pageSize: 100,
pageNumber: 1,
orderDirection: "Ascending",
orderBy: "SortOrder"
pageSize: 25,
pageNumber: 1
};
if (options === undefined) {
options = {};
@@ -133,16 +129,7 @@ function relationTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
angular.extend(defaults, options);
//now copy back to the options we will use
options = defaults;
//change asc/desct
if (options.orderDirection === "asc") {
options.orderDirection = "Ascending";
}
else if (options.orderDirection === "desc") {
options.orderDirection = "Descending";
}
console.log('options before HTTP', options);
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
@@ -151,9 +138,7 @@ function relationTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
{
id: id,
pageNumber: options.pageNumber,
pageSize: options.pageSize,
orderBy: options.orderBy,
orderDirection: options.orderDirection
pageSize: options.pageSize
}
)),
'Failed to get paged relations for id ' + id);

1
src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
View File

@@ -25,7 +25,6 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
vm.changePageNumber = changePageNumber;
vm.options = {};
vm.options.pageSize = 3;
var labelKeys = [
"relationType_tabRelationType",