From 58fe6217eb23ef2239a72f6d61f453b58deda6b7 Mon Sep 17 00:00:00 2001 From: tliero Date: Thu, 4 Aug 2016 16:33:30 +0200 Subject: [PATCH] Bugfix for autoselection of creditor --- pom.xml | 2 +- src/main/resources/static/app/controllers.js | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1d09d64..84ae5ac 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.tilman next-transactions - 1.5.7 + 1.5.8 org.springframework.boot diff --git a/src/main/resources/static/app/controllers.js b/src/main/resources/static/app/controllers.js index 3814bfd..59a93bc 100644 --- a/src/main/resources/static/app/controllers.js +++ b/src/main/resources/static/app/controllers.js @@ -26,7 +26,7 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$routePara // get outstandings (expenses and withdrawals) for all users of the account var promises = new Array($scope.accountUsers.length); for (i = 0; i < $scope.accountUsers.length; i++) { - var resource = $resource('/api/transactions/search/outstandings', { accountId: $scope.account.id, userId: $scope.accountUsers[i].id }).get(); + var resource = $resource('/api/transactions/search/outstandings', { accountId: $scope.account.id, userId: $scope.accountUsers[i].id, size: 500 }).get(); promises[i] = resource.$promise; } @@ -106,13 +106,7 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$routePara // if this is selected to be a withdrawal, preselect the current user and disable "no creditor" radio button if ($scope.transaction.category.name === 'Private Entnahme') { - var userLabels = document.getElementsByClassName('userLabel'); - - for (i = 0; i < userLabels.length; i++) { - if (userLabels[i].innerHTML.indexOf($scope.userinfo.name) >= 0) { - userLabels[i].getElementsByTagName('INPUT')[0].checked = true; - } - } + $scope.transaction.creditor = $scope.userinfo._links.self.href; document.getElementById('noCreditorRadioButton').disabled = true; } else { @@ -465,13 +459,9 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l } - console.log('$scope.csv.length: ' + $scope.csv.length); - for (i = 0; i < $scope.csv.length; i++) { var j = 0; - console.log($scope.csv[i]); - while (j < $scope.matchers.length) { var match = true;