Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Import DiscourseRoute rather than Discourse.Route (#8225) 

* DEV: Discourse.Route -> DiscourseRoute with import

* ran prettier on all routes

* prettiered one more file
This commit is contained in:
Mark VanLandingham 2019-10-22 08:46:10 -05:00 committed by Robin Ward
parent 12409f63a0
commit e5311ab645
106 changed files with 268 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/routes/admin-backups.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import showModal from "discourse/lib/show-modal";
import BackupStatus from "admin/models/backup-status";
@ -6,7 +7,7 @@ import PreloadStore from "preload-store";
const LOG_CHANNEL = "/admin/backups/logs";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
activate() {
this.messageBus.subscribe(LOG_CHANNEL, log => {
if (log.message === "[STARTED]") {

3
app/assets/javascripts/admin/routes/admin-badges.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import Badge from "discourse/models/badge";
import BadgeGrouping from "discourse/models/badge-grouping";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
_json: null,
model() {

4
app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
activate() {
this.controllerFor("admin-dashboard-general").fetchDashboard();
}

3
app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return ajax("/admin/reports").then(json => json);
},

3
app/assets/javascripts/admin/routes/admin-dashboard.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { scrollTop } from "discourse/mixins/scroll-top";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
activate() {
this.controllerFor("admin-dashboard").fetchProblems();
this.controllerFor("admin-dashboard").fetchDashboard();

3
app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import IncomingEmail from "admin/models/incoming-email";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return IncomingEmail.findAll({ status: this.status });
},

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

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import EmailSettings from "admin/models/email-settings";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return EmailSettings.find();
}

4
app/assets/javascripts/admin/routes/admin-email-logs.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
setupController(controller) {
controller.setProperties({
loading: true,

3
app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
View File

@ -1,9 +1,10 @@
import DiscourseRoute from "discourse/routes/discourse";
import {
default as EmailPreview,
oneWeekAgo
} from "admin/models/email-preview";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return EmailPreview.findDigest(this.currentUser.get("username"));
},

4
app/assets/javascripts/admin/routes/admin-emojis.js.es6
View File

@ -1,5 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model: function() {
return ajax("/admin/customize/emojis.json").then(function(emojis) {
return emojis.map(function(emoji) {

4
app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.store.findAll("flagged-post", { filter: "active" });
}

4
app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.store.findAll("flagged-post", { filter: "old" });
}

4
app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.store.findAll("flagged-topic");
},

4
app/assets/javascripts/admin/routes/admin-logs-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
redirect: function() {
this.transitionTo("adminLogs.staffActionLogs");
}

4
app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
renderTemplate: function() {
this.render("admin/templates/logs/screened-emails", { into: "adminLogs" });
},

4
app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
renderTemplate() {
this.render("admin/templates/logs/screened-ip-addresses", {
into: "adminLogs"

4
app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
renderTemplate: function() {
this.render("admin/templates/logs/screened-urls", { into: "adminLogs" });
},

3
app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import showModal from "discourse/lib/show-modal";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
// TODO: make this automatic using an `{{outlet}}`
renderTemplate: function() {
this.render("admin/templates/logs/staff-action-logs", {

3
app/assets/javascripts/admin/routes/admin-permalinks.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import Permalink from "admin/models/permalink";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return Permalink.findAll();
},

4
app/assets/javascripts/admin/routes/admin-reports-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel() {
this.transitionTo("admin.dashboardReports");
}

4
app/assets/javascripts/admin/routes/admin-reports-show.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
queryParams: {
start_date: { refreshModel: true },
end_date: { refreshModel: true },

3
app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
period: { refreshModel: true },
searchType: { refreshModel: true }

3
app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import { fillMissingDates } from "discourse/lib/utilities";
import { translateResults } from "discourse/lib/search";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
term: { refreshModel: true },
period: { refreshModel: true },

4
app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model(params) {
// The model depends on user input, so let the controller do the work:
this.controllerFor("adminSiteSettingsCategory").set(

4
app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
View File

@ -2,7 +2,9 @@
Handles when you click the Site Settings tab in admin, but haven't
chosen a category. It will redirect to the first category.
**/
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel() {
this.replaceWith(
"adminSiteSettingsCategory",

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

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import SiteSetting from "admin/models/site-setting";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
filter: { replace: true }
},

3
app/assets/javascripts/admin/routes/admin-user-badges.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import UserBadge from "discourse/models/user-badge";
import Badge from "discourse/models/badge";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
const username = this.modelFor("adminUser").get("username");
return UserBadge.findByUsername(username);

3
app/assets/javascripts/admin/routes/admin-user-fields.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import UserField from "admin/models/user-field";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model: function() {
return this.store.findAll("user-field");
},

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

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import Group from "discourse/models/group";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return this.modelFor("adminUser");
},

4
app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.modelFor("adminUser");
}

3
app/assets/javascripts/admin/routes/admin-user.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import AdminUser from "admin/models/admin-user";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
serialize(model) {
return {
user_id: model.get("id"),

4
app/assets/javascripts/admin/routes/admin-users-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
redirect: function() {
this.transitionTo("adminUsersList");
}

4
app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel: function() {
this.transitionTo("adminUsersList.show", "active");
}

4
app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
queryParams: {
order: { refreshModel: true },
ascending: { refreshModel: true }

3
app/assets/javascripts/admin/routes/admin-users-list.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result";
import AdminUser from "admin/models/admin-user";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
actions: {
exportUsers() {
exportEntity("user_list", {

4
app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model(params) {
this.controllerFor("adminWatchedWordsAction").set(
"actionNameKey",

4
app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel() {
this.replaceWith(
"adminWatchedWords.action",

3
app/assets/javascripts/admin/routes/admin-watched-words.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import WatchedWord from "admin/models/watched-word";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
filter: { replace: true }
},

4
app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model(params) {
return this.store.findAll(
"web-hook-event",

4
app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
serialize(model) {
return { web_hook_id: model.get("id") || "new" };
},

4
app/assets/javascripts/admin/routes/admin.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("admin_title");
},

3
app/assets/javascripts/discourse/lib/static-route-builder.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import StaticPage from "discourse/models/static-page";
import { default as DiscourseURL, jumpToElement } from "discourse/lib/url";
@ -8,7 +9,7 @@ const configs = {
};
export default function(page) {
return Discourse.Route.extend({
return DiscourseRoute.extend({
renderTemplate() {
this.render("static");
},

4
app/assets/javascripts/discourse/routes/about.js.es6
View File

@ -1,5 +1,7 @@
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return ajax("/about.json").then(result => {
let activeAdmins = [];

3
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import { setting } from "discourse/lib/computed";
import logout from "discourse/lib/logout";
@ -20,7 +21,7 @@ function unlessReadOnly(method, message) {
};
}
const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
siteTitle: setting("title"),
shortSiteDescription: setting("short_site_description"),

3
app/assets/javascripts/discourse/routes/associate-account.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import showModal from "discourse/lib/show-modal";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
beforeModel() {
const params = this.paramsFor("associate-account");
this.replaceWith(`preferences.account`, this.currentUser).then(() =>

3
app/assets/javascripts/discourse/routes/badges-index.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import Badge from "discourse/models/badge";
import PreloadStore from "preload-store";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
if (PreloadStore.get("badges")) {
return PreloadStore.getAndRemove("badges").then(json =>

3
app/assets/javascripts/discourse/routes/badges-show.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import UserBadge from "discourse/models/user-badge";
import Badge from "discourse/models/badge";
import PreloadStore from "preload-store";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
username: {
refreshModel: true

3
app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import { emojiUnescape } from "discourse/lib/text";
export default function(filter) {
return Discourse.Route.extend({
return DiscourseRoute.extend({
actions: {
didTransition() {
this.controllerFor("user").set("indexStream", true);

3
app/assets/javascripts/discourse/routes/build-category-route.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import {
filterQueryParams,
findTopicList
@ -10,7 +11,7 @@ import Category from "discourse/models/category";
// A helper function to create a category route with parameters
export default (filterArg, params) => {
return Discourse.Route.extend({
return DiscourseRoute.extend({
queryParams,
model(modelParams) {

3
app/assets/javascripts/discourse/routes/build-topic-route.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import { queryParams } from "discourse/controllers/discovery-sortable";
import { defaultHomepage } from "discourse/lib/utilities";
@ -70,7 +71,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
export default function(filter, extras) {
extras = extras || {};
return Discourse.Route.extend(
return DiscourseRoute.extend(
{
queryParams,

3
app/assets/javascripts/discourse/routes/discovery-categories.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import showModal from "discourse/lib/show-modal";
import OpenComposer from "discourse/mixins/open-composer";
import CategoryList from "discourse/models/category-list";
@ -7,7 +8,7 @@ import { ajax } from "discourse/lib/ajax";
import PreloadStore from "preload-store";
import { searchPriorities } from "discourse/components/concerns/category-search-priorities";
const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
renderTemplate() {
this.render("navigation/categories", { outlet: "navigation-bar" });
this.render("discovery/categories", { outlet: "list-container" });

3
app/assets/javascripts/discourse/routes/discovery.js.es6
View File

@ -2,10 +2,11 @@
The parent route for all discovery routes.
Handles the logic for showing the loading spinners.
**/
import DiscourseRoute from "discourse/routes/discourse";
import OpenComposer from "discourse/mixins/open-composer";
import { scrollTop } from "discourse/mixins/scroll-top";
export default Discourse.Route.extend(OpenComposer, {
export default DiscourseRoute.extend(OpenComposer, {
redirect() {
return this.redirectIfLoginRequired();
},

3
app/assets/javascripts/discourse/routes/email-login.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("login.title");
},

4
app/assets/javascripts/discourse/routes/exception.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
serialize() {
return "";
},

3
app/assets/javascripts/discourse/routes/full-page-search.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import {
translateResults,
@ -8,7 +9,7 @@ import PreloadStore from "preload-store";
import { getTransient, setTransient } from "discourse/lib/page-tracker";
import { escapeExpression } from "discourse/lib/utilities";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
queryParams: {
q: {},
expanded: false,

4
app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
View File

@ -1,5 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
export function buildGroupPage(type) {
return Discourse.Route.extend({
return DiscourseRoute.extend({
type,
titleToken() {

4
app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t(`groups.topics`);
},

3
app/assets/javascripts/discourse/routes/group-index.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import showModal from "discourse/lib/show-modal";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("groups.members.title");
},

4
app/assets/javascripts/discourse/routes/group-manage-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
beforeModel() {

4
app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
titleToken() {

4
app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("groups.manage.logs.title");
},

4
app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
titleToken() {

4
app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
titleToken() {

4
app/assets/javascripts/discourse/routes/group-manage.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
titleToken() {

4
app/assets/javascripts/discourse/routes/group-members.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel: function() {
this.transitionTo("group.index");
}

4
app/assets/javascripts/discourse/routes/group-messages.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("groups.messages");
},

4
app/assets/javascripts/discourse/routes/group-requests.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("groups.requests.title");
},

4
app/assets/javascripts/discourse/routes/group.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return [this.modelFor("group").get("name")];
},

4
app/assets/javascripts/discourse/routes/groups-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("groups.index.title");
},

3
app/assets/javascripts/discourse/routes/groups-new.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import Group from "discourse/models/group";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
showFooter: true,
titleToken() {

3
app/assets/javascripts/discourse/routes/invites-show.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import PreloadStore from "preload-store";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("invites.accept_title");
},

3
app/assets/javascripts/discourse/routes/new-message.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import User from "discourse/models/user";
import Group from "discourse/models/group";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
beforeModel(transition) {
const params = transition.to.queryParams;

3
app/assets/javascripts/discourse/routes/new-topic.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import Category from "discourse/models/category";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
beforeModel(transition) {
if (this.currentUser) {
let category, categoryId;

3
app/assets/javascripts/discourse/routes/password-reset.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import PreloadStore from "preload-store";
import { ajax } from "discourse/lib/ajax";
import { userPath } from "discourse/lib/url";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("login.reset_password");
},

3
app/assets/javascripts/discourse/routes/post.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
beforeModel({ params }) {
return ajax(`/p/${params.post.id}`).then(t => {
this.transitionTo(

4
app/assets/javascripts/discourse/routes/review-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model(params) {
return this.store.findAll("reviewable", params);
},

4
app/assets/javascripts/discourse/routes/review-settings.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.store.find("reviewable-settings");
},

4
app/assets/javascripts/discourse/routes/review-show.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
setupController(controller, model) {
controller.set("reviewable", model);
}

4
app/assets/javascripts/discourse/routes/review-topics.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
return this.store.findAll("reviewable-topic");
},

4
app/assets/javascripts/discourse/routes/review.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
titleToken() {
return I18n.t("review.title");
}

4
app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
model(params) {

4
app/assets/javascripts/discourse/routes/tag-groups.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
model() {

3
app/assets/javascripts/discourse/routes/tags-index.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import Tag from "discourse/models/tag";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return this.store.findAll("tag").then(result => {
if (result.extras) {

3
app/assets/javascripts/discourse/routes/tags-show.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import Composer from "discourse/models/composer";
import showModal from "discourse/lib/show-modal";
import {
@ -7,7 +8,7 @@ import {
import { queryParams } from "discourse/controllers/discovery-sortable";
import PermissionType from "discourse/models/permission-type";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
navMode: "latest",
queryParams,

3
app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import { default as Topic, ID_CONSTRAINT } from "discourse/models/topic";
import DiscourseURL from "discourse/lib/url";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model(params) {
if (params.slugOrId.match(ID_CONSTRAINT)) {
return { url: `/t/topic/${params.slugOrId}` };

3
app/assets/javascripts/discourse/routes/topic-from-params.js.es6
View File

@ -1,8 +1,9 @@
import DiscourseRoute from "discourse/routes/discourse";
import DiscourseURL from "discourse/lib/url";
import Draft from "discourse/models/draft";
// This route is used for retrieving a topic based on params
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
// Avoid default model hook
model(params) {
return params;

3
app/assets/javascripts/discourse/routes/topic.js.es6
View File

@ -1,3 +1,4 @@
import DiscourseRoute from "discourse/routes/discourse";
import DiscourseURL from "discourse/lib/url";
import { ID_CONSTRAINT } from "discourse/models/topic";
@ -9,7 +10,7 @@ const SCROLL_DELAY = 500;
import showModal from "discourse/lib/show-modal";
const TopicRoute = Discourse.Route.extend({
const TopicRoute = DiscourseRoute.extend({
redirect() {
return this.redirectIfLoginRequired();
},

3
app/assets/javascripts/discourse/routes/unknown.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
return ajax("/404-body", { dataType: "html" });
}

4
app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
let userDraftsStream = this.modelFor("user").get("userDraftsStream");
return userDraftsStream.load(this.site).then(() => userDraftsStream);

3
app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import ViewingActionType from "discourse/mixins/viewing-action-type";
export default Discourse.Route.extend(ViewingActionType, {
export default DiscourseRoute.extend(ViewingActionType, {
queryParams: {
acting_username: { refreshModel: true }
},

4
app/assets/javascripts/discourse/routes/user-activity.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
model() {
let user = this.modelFor("user");
if (user.get("profile_hidden")) {

3
app/assets/javascripts/discourse/routes/user-badges.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import ViewingActionType from "discourse/mixins/viewing-action-type";
import UserBadge from "discourse/models/user-badge";
export default Discourse.Route.extend(ViewingActionType, {
export default DiscourseRoute.extend(ViewingActionType, {
model() {
return UserBadge.findByUsername(
this.modelFor("user").get("username_lower"),

4
app/assets/javascripts/discourse/routes/user-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel() {
const { currentUser } = this;
const viewingMe =

4
app/assets/javascripts/discourse/routes/user-invited-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
beforeModel: function() {
this.replaceWith("userInvited.show", "pending");
}

3
app/assets/javascripts/discourse/routes/user-invited-show.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import Invite from "discourse/models/invite";
import showModal from "discourse/lib/show-modal";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model(params) {
Invite.findInvitedCount(this.modelFor("user")).then(result =>
this.set("invitesCount", result)

4
app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
controllerName: "user-notifications",
renderTemplate() {
this.render("user/notifications-index");

3
app/assets/javascripts/discourse/routes/user-notifications.js.es6
View File

@ -1,6 +1,7 @@
import DiscourseRoute from "discourse/routes/discourse";
import ViewingActionType from "discourse/mixins/viewing-action-type";
export default Discourse.Route.extend(ViewingActionType, {
export default DiscourseRoute.extend(ViewingActionType, {
renderTemplate() {
this.render("user/notifications");
},

3
app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
model() {
const username = this.modelFor("user").get("username_lower");
return ajax(`/tags/personal_messages/${username}`)

3
app/assets/javascripts/discourse/routes/user-private-messages.js.es6
View File

@ -1,7 +1,8 @@
import DiscourseRoute from "discourse/routes/discourse";
import Draft from "discourse/models/draft";
import Composer from "discourse/models/composer";
export default Discourse.Route.extend({
export default DiscourseRoute.extend({
renderTemplate() {
this.render("user/messages");
},

4
app/assets/javascripts/discourse/routes/user-summary.js.es6
View File

@ -1,4 +1,6 @@
export default Discourse.Route.extend({
import DiscourseRoute from "discourse/routes/discourse";
export default DiscourseRoute.extend({
showFooter: true,
model() {

Some files were not shown because too many files have changed in this diff Show More