github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 01:56:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Neil Lalonde
2016-03-31 17:33:25 -04:00
parent 95f2ac6535
commit 01d0aeb5a9
6371 changed files with 86540 additions and 60860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/controllers/admin-api.js.es6
View File

@ -1,3 +1,5 @@
import ApiKey from 'admin/models/api-key';
/**
This controller supports the interface for dealing with API keys
@ -16,7 +18,7 @@ export default Ember.ArrayController.extend({
**/
generateMasterKey: function() {
var self = this;
Discourse.ApiKey.generateMasterKey().then(function (key) {
ApiKey.generateMasterKey().then(function (key) {
self.get('model').pushObject(key);
});
},
@ -25,7 +27,7 @@ export default Ember.ArrayController.extend({
Creates an API key instance with internal user object
@method regenerateKey
@param {Discourse.ApiKey} key the key to regenerate
@param {ApiKey} key the key to regenerate
**/
regenerateKey: function(key) {
bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
@ -39,7 +41,7 @@ export default Ember.ArrayController.extend({
Revokes an API key
@method revokeKey
@param {Discourse.ApiKey} key the key to revoke
@param {ApiKey} key the key to revoke
**/
revokeKey: function(key) {
var self = this;