Merge pull request #8046 from bjarnef/v8/feature/ysod-overlay

Replace ysod umb-overlay using overlayService.ysod
This commit is contained in:
Nathan Woulfe
2020-07-06 08:23:21 +10:00
committed by GitHub
2 changed files with 9 additions and 27 deletions

View File

@@ -227,26 +227,21 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
if (err.status && err.status >= 500) {
// Open ysod overlay
$scope.ysodOverlay = {
view: "ysod",
error: err,
show: true
};
overlayService.ysod(err);
}
$timeout(function () {
$scope.bulkStatus = "";
$scope.actionInProgress = false;
},
500);
}, 500);
if (successMsgPromise) {
localizationService.localize("bulk_done")
.then(function (v) {
successMsgPromise.then(function (successMsg) {
notificationsService.success(v, successMsg);
})
});
if (successMsgPromise)
{
localizationService.localize("bulk_done").then(function (v) {
successMsgPromise.then(function (successMsg) {
notificationsService.success(v, successMsg);
})
});
}
}
@@ -271,7 +266,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
with simple values */
$scope.getContent = function (contentId) {
$scope.reloadView($scope.contentId, true);
}
@@ -327,8 +321,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
});
};
$scope.makeSearch = function() {
if ($scope.options.filter !== null && $scope.options.filter !== undefined) {
$scope.options.pageNumber = 1;
@@ -408,7 +400,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
dialog.title = value;
overlayService.open(dialog);
});
};
function performDelete() {
@@ -704,8 +695,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
// set what we've got on the result
result[alias] = value;
});
}
function isDate(val) {

View File

@@ -230,11 +230,4 @@
</div>
<umb-overlay
ng-if="ysodOverlay.show"
model="ysodOverlay"
position="right"
view="ysodOverlay.view">
</umb-overlay>
</div>