diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6 index b7dbaf764b2..ee6cc037385 100644 --- a/app/assets/javascripts/admin/components/ip-lookup.js.es6 +++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6 @@ -26,7 +26,7 @@ export default Ember.Component.extend({ this.set("otherAccountsLoading", true); Discourse.AdminUser.findAll("active", { "ip": this.get("ip"), - "exclude": this.get("user_id"), + "exclude": this.get("userId"), "order": "trust_level DESC" }).then(function (users) { self.setProperties({ @@ -41,7 +41,7 @@ export default Ember.Component.extend({ this.set("show", false); }, - deleteAllOtherAccounts: function() { + deleteOtherAccounts: function() { var self = this; bootbox.confirm(I18n.t("ip_lookup.confirm_delete_other_accounts"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) { if (confirmed) { @@ -50,7 +50,7 @@ export default Ember.Component.extend({ type: "DELETE", data: { "ip": self.get("ip"), - "exclude": self.get("user_id"), + "exclude": self.get("userId"), "order": "trust_level DESC" } }).then(function() { diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user_index.hbs index 5ce3303734b..63b9d642530 100644 --- a/app/assets/javascripts/admin/templates/user_index.hbs +++ b/app/assets/javascripts/admin/templates/user_index.hbs @@ -110,7 +110,7 @@ - {{ip-lookup ip=ip_address user_id=id}} + {{ip-lookup ip=ip_address userId=id}} {{/if}} @@ -120,7 +120,7 @@