Merge remote-tracking branch 'origin/master'
Conflicts: src/main/resources/static/js/controllers.js src/main/resources/static/partials/transaction-list.html
This commit is contained in:
@@ -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());
|
||||||
|
|||||||
Reference in New Issue
Block a user