From c49a1288b2c59a9627e263d15d4ec32efcf7ee8b Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 7 Jul 2020 11:43:15 +1000 Subject: [PATCH] Revert "Import getURL to fix deprecation warnings (#72)" This reverts commit e3a6a64193ed4546f1b8c19e55ee3c27248af7f4. This sadly broke our build --- .../initializers/extend-for-assigns.js.es6 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6 b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6 index 56b7534..9f2f67e 100644 --- a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6 +++ b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6 @@ -5,7 +5,6 @@ import { iconHTML, iconNode } from "discourse-common/lib/icon-library"; import { h } from "virtual-dom"; import { queryRegistry } from "discourse/widgets/widget"; import { getOwner } from "discourse-common/lib/get-owner"; -import getURL from "discourse-common/lib/get-url"; import { htmlSafe } from "@ember/template"; function titleForState(user) { @@ -102,7 +101,10 @@ function initialize(api) { }, customHref: 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) => { @@ -171,7 +173,7 @@ function initialize(api) { @computed("assigned_to_user") assignedToUserPath(assignedToUser) { const siteSettings = api.container.lookup("site-settings:main"); - return getURL( + return Discourse.getURL( siteSettings.assigns_user_url_path.replace( "{username}", assignedToUser.username @@ -183,7 +185,7 @@ function initialize(api) { api.modifyClass("model:bookmark", { @computed("assigned_to_user") assignedToUserPath(assignedToUser) { - return getURL( + return Discourse.getURL( this.siteSettings.assigns_user_url_path.replace( "{username}", assignedToUser.username