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

DEV: Move Discourse.getURL and related functions to a module (#9966)

Browse Source 
* DEV: Move `Discourse.getURL` and related functions to a module

* DEV: Remove `Discourse.getURL` and `Discourse.getURLWithCDN`

* FIX: `get-url` is required for server side code

* DEV: Deprecate `BaseUri` too.
This commit is contained in:
Robin Ward
2020-06-03 12:45:26 -04:00
committed by GitHub
parent d27b877a40
commit ba00cc8ec4
90 changed files with 401 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/controllers/admin-dashboard-general.js
View File

@ -8,6 +8,7 @@ import AdminDashboard from "admin/models/admin-dashboard";
import Report from "admin/models/report";
import PeriodComputationMixin from "admin/mixins/period-computation";
import { computed } from "@ember/object";
import getURL from "discourse-common/lib/get-url";
function staticReport(reportType) {
return computed("reports.[]", function() {
@ -20,7 +21,6 @@ export default Controller.extend(PeriodComputationMixin, {
dashboardFetchedAt: null,
exceptionController: inject("exception"),
logSearchQueriesEnabled: setting("log_search_queries"),
basePath: Discourse.BaseUri,
@discourseComputed("siteSettings.dashboard_general_tab_activity_metrics")
activityMetrics(metrics) {
@ -107,7 +107,7 @@ export default Controller.extend(PeriodComputationMixin, {
@discourseComputed
trendingSearchDisabledLabel() {
return I18n.t("admin.dashboard.reports.trending_search.disabled", {
basePath: Discourse.BaseUri
basePath: getURL("/")
});
},
@ -150,6 +150,6 @@ export default Controller.extend(PeriodComputationMixin, {
},
_reportsForPeriodURL(period) {
return Discourse.getURL(`/admin?period=${period}`);
return getURL(`/admin?period=${period}`);
}
});