Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 20:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: errors due to confusion between trustLevel and trust_level (#8149)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-10-03 08:52:07 -04:00 committed by GitHub
parent 1e2aa263a9
commit aaf15944f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/models/admin-user.js.es6
View File

@ -243,12 +243,12 @@ const AdminUser = Discourse.User.extend({
this.set("originalTrustLevel", this.trust_level); this.set("originalTrustLevel", this.trust_level);
}, },
dirty: propertyNotEqual("originalTrustLevel", "trustLevel.id"), dirty: propertyNotEqual("originalTrustLevel", "trust_level"),
saveTrustLevel() { saveTrustLevel() {
return ajax(`/admin/users/${this.id}/trust_level`, { return ajax(`/admin/users/${this.id}/trust_level`, {
type: "PUT", type: "PUT",
data: { level: this.get("trustLevel.id") } data: { level: this.trust_level }
}) })
.then(() => window.location.reload()) .then(() => window.location.reload())
.catch(e => { .catch(e => {
@ -266,7 +266,7 @@ const AdminUser = Discourse.User.extend({
}, },
restoreTrustLevel() { restoreTrustLevel() {
this.set("trustLevel.id", this.originalTrustLevel); this.set("trust_level", this.originalTrustLevel);
}, },
lockTrustLevel(locked) { lockTrustLevel(locked) {

5
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -369,8 +369,9 @@
<div class="value"> <div class="value">
{{combo-box {{combo-box
content=site.trustLevels content=site.trustLevels
value=model.trustLevel.id value=model.trust_level
nameProperty="detailedName"}} nameProperty="detailedName"
}}
{{#if model.dirty}} {{#if model.dirty}}
<div> <div>