Revert "Import getURL to fix deprecation warnings (#72)"
This reverts commit e3a6a64193
.
This sadly broke our build
This commit is contained in:
parent
1a083e8b88
commit
c49a1288b2
|
@ -5,7 +5,6 @@ import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
|
||||||
import { h } from "virtual-dom";
|
import { h } from "virtual-dom";
|
||||||
import { queryRegistry } from "discourse/widgets/widget";
|
import { queryRegistry } from "discourse/widgets/widget";
|
||||||
import { getOwner } from "discourse-common/lib/get-owner";
|
import { getOwner } from "discourse-common/lib/get-owner";
|
||||||
import getURL from "discourse-common/lib/get-url";
|
|
||||||
import { htmlSafe } from "@ember/template";
|
import { htmlSafe } from "@ember/template";
|
||||||
|
|
||||||
function titleForState(user) {
|
function titleForState(user) {
|
||||||
|
@ -102,7 +101,10 @@ function initialize(api) {
|
||||||
},
|
},
|
||||||
customHref: category => {
|
customHref: category => {
|
||||||
if (category) {
|
if (category) {
|
||||||
return getURL(category.url) + "/l/latest?status=open&assigned=nobody";
|
return (
|
||||||
|
Discourse.getURL(category.url) +
|
||||||
|
"/l/latest?status=open&assigned=nobody"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
forceActive: (category, args, router) => {
|
forceActive: (category, args, router) => {
|
||||||
|
@ -171,7 +173,7 @@ function initialize(api) {
|
||||||
@computed("assigned_to_user")
|
@computed("assigned_to_user")
|
||||||
assignedToUserPath(assignedToUser) {
|
assignedToUserPath(assignedToUser) {
|
||||||
const siteSettings = api.container.lookup("site-settings:main");
|
const siteSettings = api.container.lookup("site-settings:main");
|
||||||
return getURL(
|
return Discourse.getURL(
|
||||||
siteSettings.assigns_user_url_path.replace(
|
siteSettings.assigns_user_url_path.replace(
|
||||||
"{username}",
|
"{username}",
|
||||||
assignedToUser.username
|
assignedToUser.username
|
||||||
|
@ -183,7 +185,7 @@ function initialize(api) {
|
||||||
api.modifyClass("model:bookmark", {
|
api.modifyClass("model:bookmark", {
|
||||||
@computed("assigned_to_user")
|
@computed("assigned_to_user")
|
||||||
assignedToUserPath(assignedToUser) {
|
assignedToUserPath(assignedToUser) {
|
||||||
return getURL(
|
return Discourse.getURL(
|
||||||
this.siteSettings.assigns_user_url_path.replace(
|
this.siteSettings.assigns_user_url_path.replace(
|
||||||
"{username}",
|
"{username}",
|
||||||
assignedToUser.username
|
assignedToUser.username
|
||||||
|
|
Loading…
Reference in New Issue