tilman/next-transactions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/resources/static/js/controllers.js
	src/main/resources/static/partials/transaction-list.html
This commit is contained in:
Tilman Liero
2016-07-09 12:03:51 +02:00
parent 89ea392bd7 30f82644ad
commit 2938d08d5c
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/js/controllers.js
-1
View File
@@ -234,7 +234,6 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
modalInstance.result.then(function(transaction) { modalInstance.result.then(function(transaction) {
$scope.lastSubmission = undefined; $scope.lastSubmission = undefined;
$log.info('refresh');
$scope.refreshList(); $scope.refreshList();
}, function () { }, function () {
$log.info('Modal dismissed at: ' + new Date()); $log.info('Modal dismissed at: ' + new Date());
src/main/resources/static/partials/transaction-list.html
+1 -1
View File
@@ -181,4 +181,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>