IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop-newgrid-row-design2

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-09-07 15:05:41 +02:00
parent ba1fbe0786 c9a30ef149
commit a38ded9e7e
131 changed files with 3458 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
public/app/features/org/org_users_ctrl.ts
View File

@@ -91,20 +91,25 @@ export class OrgUsersCtrl {
evt.stopPropagation();
}
openAddUsersView() {
var modalScope = this.$scope.$new();
modalScope.invitesSent = this.get.bind(this);
getInviteUrl(invite) {
return invite.url;
}
var src = config.disableLoginForm
? 'public/app/features/org/partials/add_user.html'
: 'public/app/features/org/partials/invite.html';
openAddUsersView() {
var modalScope = this.$scope.$new();
modalScope.invitesSent = this.get.bind(this);
var src = config.disableLoginForm
? 'public/app/features/org/partials/add_user.html'
: 'public/app/features/org/partials/invite.html';
this.$scope.appEvent('show-modal', {
src: src,
modalClass: 'invite-modal',
scope: modalScope
});
}
this.$scope.appEvent('show-modal', {
src: src,
modalClass: 'invite-modal',
scope: modalScope
});
}
}
coreModule.controller('OrgUsersCtrl', OrgUsersCtrl);