github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 07:31:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Import getProperties from @ember/object

Browse Source
This commit is contained in:
Mark VanLandingham
2019-11-04 09:56:16 -06:00
committed by Robin Ward
parent 74869b8a7f
commit fa56ba89a5
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
View File

@ -1,5 +1,6 @@
import Route from "@ember/routing/route"; import Route from "@ember/routing/route";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import { getProperties } from "@ember/object";
export default Route.extend({ export default Route.extend({
queryParams: { queryParams: {
@ -10,7 +11,7 @@ export default Route.extend({
model(params) { model(params) {
return this.store.find( return this.store.find(
"site-text", "site-text",
Ember.getProperties(params, "q", "overridden") getProperties(params, "q", "overridden")
); );
}, },

3
app/assets/javascripts/discourse-loader.js
View File

@ -13,7 +13,8 @@ var define, requirejs;
}, },
"@ember/object": { "@ember/object": {
default: Ember.Object, default: Ember.Object,
get: Ember.get get: Ember.get,
getProperties: Ember.getProperties
}, },
"@ember/object/computed": { "@ember/object/computed": {
default: Ember.computed, default: Ember.computed,

3
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -23,6 +23,7 @@ import PreloadStore from "preload-store";
import { defaultHomepage } from "discourse/lib/utilities"; import { defaultHomepage } from "discourse/lib/utilities";
import { userPath } from "discourse/lib/url"; import { userPath } from "discourse/lib/url";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import { getProperties } from "@ember/object";
export const SECOND_FACTOR_METHODS = { export const SECOND_FACTOR_METHODS = {
TOTP: 1, TOTP: 1,
@ -350,7 +351,7 @@ const User = RestModel.extend({
}) })
.then(result => { .then(result => {
this.set("bio_excerpt", result.user.bio_excerpt); this.set("bio_excerpt", result.user.bio_excerpt);
const userProps = Ember.getProperties( const userProps = getProperties(
this.user_option, this.user_option,
"enable_quoting", "enable_quoting",
"enable_defer", "enable_defer",