github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 03:06:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moar camelCase

Browse Source
This commit is contained in:
Régis Hanol
2014-11-24 18:04:34 +01:00
parent 17b6d3a2fe
commit 7f9747f55c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/components/ip-lookup.js.es6
View File

@ -26,7 +26,7 @@ export default Ember.Component.extend({
this.set("otherAccountsLoading", true); this.set("otherAccountsLoading", true);
Discourse.AdminUser.findAll("active", { Discourse.AdminUser.findAll("active", {
"ip": this.get("ip"), "ip": this.get("ip"),
"exclude": this.get("user_id"), "exclude": this.get("userId"),
"order": "trust_level DESC" "order": "trust_level DESC"
}).then(function (users) { }).then(function (users) {
self.setProperties({ self.setProperties({
@ -41,7 +41,7 @@ export default Ember.Component.extend({
this.set("show", false); this.set("show", false);
}, },
deleteAllOtherAccounts: function() { deleteOtherAccounts: function() {
var self = this; var self = this;
bootbox.confirm(I18n.t("ip_lookup.confirm_delete_other_accounts"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) { bootbox.confirm(I18n.t("ip_lookup.confirm_delete_other_accounts"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) {
if (confirmed) { if (confirmed) {
@ -50,7 +50,7 @@ export default Ember.Component.extend({
type: "DELETE", type: "DELETE",
data: { data: {
"ip": self.get("ip"), "ip": self.get("ip"),
"exclude": self.get("user_id"), "exclude": self.get("userId"),
"order": "trust_level DESC" "order": "trust_level DESC"
} }
}).then(function() { }).then(function() {

4
app/assets/javascripts/admin/templates/user_index.hbs
View File

@ -110,7 +110,7 @@
<button class='btn' {{action "refreshBrowsers" target="content"}}> <button class='btn' {{action "refreshBrowsers" target="content"}}>
{{i18n admin.user.refresh_browsers}} {{i18n admin.user.refresh_browsers}}
</button> </button>
{{ip-lookup ip=ip_address user_id=id}} {{ip-lookup ip=ip_address userId=id}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -120,7 +120,7 @@
<div class='value'>{{registration_ip_address}}</div> <div class='value'>{{registration_ip_address}}</div>
<div class='controls'> <div class='controls'>
{{#if currentUser.staff}} {{#if currentUser.staff}}
{{ip-lookup ip=registration_ip_address user_id=id}} {{ip-lookup ip=registration_ip_address userId=id}}
{{/if}} {{/if}}
</div> </div>
</div> </div>