close user dialog when clicking on edit, history links and logout
This commit is contained in:
@@ -30,18 +30,18 @@ angular.module("umbraco")
|
||||
var pendingChangeEvent = eventsService.on("valFormManager.pendingChanges", function (e, args) {
|
||||
//one time listener, remove the event
|
||||
pendingChangeEvent();
|
||||
$scope.closeOverLay();
|
||||
$scope.model.close();
|
||||
});
|
||||
|
||||
|
||||
//perform the path change, if it is successful then the promise will resolve otherwise it will fail
|
||||
$scope.closeOverLay();
|
||||
$scope.model.close();
|
||||
$location.path("/logout");
|
||||
};
|
||||
|
||||
$scope.gotoHistory = function (link) {
|
||||
$location.path(link);
|
||||
$scope.closeOverLay();
|
||||
$scope.model.close();
|
||||
};
|
||||
|
||||
//Manually update the remaining timeout seconds
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
<umb-button
|
||||
type="link"
|
||||
href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
|
||||
action="model.close()"
|
||||
button-style="primary"
|
||||
action="closeOverLay()"
|
||||
label="Edit"
|
||||
label-key="general_edit"
|
||||
ng-if="canEditProfile">
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
<div ng-if="state !== 'init'" class="umb-button__overlay"></div>
|
||||
|
||||
<a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}">
|
||||
<a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" ng-click="action(model)" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}">
|
||||
<span class="umb-button__content" ng-class="{'-hidden': state !== 'init'}">
|
||||
<i ng-if="icon && buttonStyle==='link'" class="{{icon}} umb-button__icon"></i>
|
||||
<localize ng-if="labelKey" key="{{labelKey}}">{{label}}</localize>
|
||||
|
||||
Reference in New Issue
Block a user