mirror of
https://github.com/discourse/discourse.git
synced 2025-01-16 01:32:41 +08:00
DEV: Move discourse-common/(utils|lib)
to discourse/lib
(#30733)
`discourse-common` was created in the past to share logic between the 'wizard' app and the main 'discourse' app. Since then, the wizard has been consolidated into the main app, so the separation of `discourse-common` is no longer useful. This commit moves `discourse-common/(lib|utils)/*` into `discourse/lib/*`, adds shims for the imports, and updates existing uses in core.
This commit is contained in:
parent
b28fafd372
commit
0ed4b09527
|
@ -5,7 +5,7 @@ import { service } from "@ember/service";
|
|||
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
|
||||
import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list";
|
||||
import AdminFilteredSiteSettings from "admin/components/admin-filtered-site-settings";
|
||||
|
|
|
@ -2,7 +2,7 @@ import Component from "@ember/component";
|
|||
import { scheduleOnce } from "@ember/runloop";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import { observes, on } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
@classNames("admin-backups-logs")
|
||||
|
|
|
@ -5,7 +5,7 @@ import { service } from "@ember/service";
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { SYSTEM_FLAG_IDS } from "discourse/lib/constants";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminFlagItem from "admin/components/admin-flag-item";
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@ import { cancel } from "@ember/runloop";
|
|||
import { service } from "@ember/service";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import SiteSettingFilter from "discourse/lib/site-setting-filter";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminSiteSettingsFilterControls from "admin/components/admin-site-settings-filter-controls";
|
||||
import SiteSetting from "admin/components/site-setting";
|
||||
|
|
|
@ -7,7 +7,7 @@ import BackButton from "discourse/components/back-button";
|
|||
import Form from "discourse/components/form";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminConfigAreaCard from "admin/components/admin-config-area-card";
|
||||
import MultiSelect from "select-kit/components/multi-select";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@ember/component";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
@classNames("penalty-history")
|
||||
export default class AdminPenaltyHistory extends Component {
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import { equal } from "@ember/object/computed";
|
||||
import discourseComputed, {
|
||||
afterRender,
|
||||
} from "discourse-common/utils/decorators";
|
||||
import discourseComputed, { afterRender } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
const ACTIONS = ["delete", "delete_replies", "edit", "none"];
|
||||
|
|
|
@ -2,7 +2,7 @@ import Component from "@ember/component";
|
|||
import { action } from "@ember/object";
|
||||
import { equal } from "@ember/object/computed";
|
||||
import { tagName } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
const CUSTOM_REASON_KEY = "custom";
|
||||
|
|
|
@ -8,7 +8,7 @@ import { eq } from "truth-helpers";
|
|||
import BackButton from "discourse/components/back-button";
|
||||
import Form from "discourse/components/form";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminConfigAreaCard from "admin/components/admin-config-area-card";
|
||||
import Permalink from "admin/models/permalink";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@glimmer/component";
|
||||
import { number } from "discourse/lib/formatter";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import Report from "admin/models/report";
|
||||
import Chart from "./chart";
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import Component from "@glimmer/component";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import hexToRGBA from "admin/lib/hex-to-rgba";
|
||||
import Report from "admin/models/report";
|
||||
import Chart from "./chart";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@glimmer/component";
|
||||
import { number } from "discourse/lib/formatter";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import Report from "admin/models/report";
|
||||
import Chart from "./chart";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@glimmer/component";
|
||||
import { number } from "discourse/lib/formatter";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import hexToRGBA from "admin/lib/hex-to-rgba";
|
||||
import Report from "admin/models/report";
|
||||
import Chart from "./chart";
|
||||
|
|
|
@ -2,7 +2,7 @@ import Component from "@ember/component";
|
|||
import { alias } from "@ember/object/computed";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import { setting } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import I18n, { i18n } from "discourse-i18n";
|
||||
|
||||
@classNames("admin-report-storage-stats")
|
||||
|
|
|
@ -6,7 +6,7 @@ import {
|
|||
classNames,
|
||||
tagName,
|
||||
} from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
@tagName("td")
|
||||
@classNames("admin-report-table-cell")
|
||||
|
|
|
@ -5,7 +5,7 @@ import {
|
|||
classNames,
|
||||
tagName,
|
||||
} from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
@tagName("th")
|
||||
@classNames("admin-report-table-header")
|
||||
|
|
|
@ -2,8 +2,8 @@ import Component from "@ember/component";
|
|||
import { action } from "@ember/object";
|
||||
import { alias } from "@ember/object/computed";
|
||||
import { classNameBindings, classNames } from "@ember-decorators/component";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
|
||||
const PAGES_LIMIT = 8;
|
||||
|
||||
|
|
|
@ -4,12 +4,12 @@ import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
|
|||
import { next } from "@ember/runloop";
|
||||
import { isPresent } from "@ember/utils";
|
||||
import { classNameBindings, classNames } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { exportEntity } from "discourse/lib/export-csv";
|
||||
import { outputExportResult } from "discourse/lib/export-result";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import ReportLoader from "discourse/lib/reports-loader";
|
||||
import { isTesting } from "discourse-common/config/environment";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report";
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import { htmlSafe } from "@ember/template";
|
|||
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
|
||||
import dIcon from "discourse/helpers/d-icon";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminReports extends Component {
|
||||
|
|
|
@ -2,8 +2,8 @@ import Component from "@ember/component";
|
|||
import { action, computed } from "@ember/object";
|
||||
import { next } from "@ember/runloop";
|
||||
import { fmt } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { isDocumentRTL } from "discourse/lib/text-direction";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminThemeEditor extends Component {
|
||||
|
|
|
@ -8,7 +8,7 @@ import DButton from "discourse/components/d-button";
|
|||
import DModal from "discourse/components/d-modal";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { extractError } from "discourse/lib/ajax-error";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
const BULK_DELETE_CHANNEL = "/bulk-user-delete";
|
||||
|
|
|
@ -5,7 +5,7 @@ import { service } from "@ember/service";
|
|||
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminConfigAreaCard from "admin/components/admin-config-area-card";
|
||||
import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list";
|
||||
|
|
|
@ -2,7 +2,7 @@ import Component from "@ember/component";
|
|||
import { action, computed } from "@ember/object";
|
||||
import { reads } from "@ember/object/computed";
|
||||
import { service } from "@ember/service";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class EmailStylesEditor extends Component {
|
||||
|
|
|
@ -3,8 +3,8 @@ import { action } from "@ember/object";
|
|||
import { notEmpty } from "@ember/object/computed";
|
||||
import { getOwner } from "@ember/owner";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import UppyUpload from "discourse/lib/uppy/uppy-upload";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
const DEFAULT_GROUP = "default";
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import { schedule } from "@ember/runloop";
|
|||
import { service } from "@ember/service";
|
||||
import { classNameBindings } from "@ember-decorators/component";
|
||||
import EmojiPickerDetached from "discourse/components/emoji-picker/detached";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { emojiUrlFor } from "discourse/lib/text";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
@classNameBindings(":value-list", ":emoji-list")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
@classNames("inline-edit")
|
||||
export default class InlineEditCheckbox extends Component {
|
||||
|
|
|
@ -14,7 +14,7 @@ import dIcon from "discourse/helpers/d-icon";
|
|||
import withEventValue from "discourse/helpers/with-event-value";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { POPULAR_THEMES } from "discourse-common/lib/popular-themes";
|
||||
import { POPULAR_THEMES } from "discourse/lib/popular-themes";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import InstallThemeItem from "admin/components/install-theme-item";
|
||||
import { COMPONENTS, THEMES } from "admin/models/theme";
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import Component from "@glimmer/component";
|
||||
import { tracked } from "@glimmer/tracking";
|
||||
import { service } from "@ember/service";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import DiscourseURL from "discourse/lib/url";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class MergeUsersProgress extends Component {
|
||||
|
|
|
@ -4,7 +4,7 @@ import { schedule } from "@ember/runloop";
|
|||
import { service } from "@ember/service";
|
||||
import { tagName } from "@ember-decorators/component";
|
||||
import { fmt } from "discourse/lib/computed";
|
||||
import discourseComputed, { bind } from "discourse-common/utils/decorators";
|
||||
import discourseComputed, { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import Permalink from "admin/models/permalink";
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import { service } from "@ember/service";
|
|||
import { gt } from "truth-helpers";
|
||||
import DButton from "discourse/components/d-button";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { cloneJSON } from "discourse-common/lib/object";
|
||||
import { cloneJSON } from "discourse/lib/object";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import Tree from "admin/components/schema-theme-setting/editor/tree";
|
||||
import FieldInput from "admin/components/schema-theme-setting/field";
|
||||
|
|
|
@ -3,7 +3,7 @@ import { action } from "@ember/object";
|
|||
import { schedule } from "@ember/runloop";
|
||||
import { service } from "@ember/service";
|
||||
import { classNames, tagName } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ScreenedIpAddress from "admin/models/screened-ip-address";
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import { action } from "@ember/object";
|
|||
import { empty } from "@ember/object/computed";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import { classNameBindings } from "@ember-decorators/component";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
@classNameBindings(":simple-list", ":value-list")
|
||||
export default class SimpleList extends Component {
|
||||
|
|
|
@ -2,7 +2,7 @@ import Component from "@glimmer/component";
|
|||
import { tracked } from "@glimmer/tracking";
|
||||
import { hash } from "@ember/helper";
|
||||
import { action } from "@ember/object";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import ListSetting from "select-kit/components/list-setting";
|
||||
|
||||
export default class CompactList extends Component {
|
||||
|
|
|
@ -5,7 +5,7 @@ import { action } from "@ember/object";
|
|||
import { service } from "@ember/service";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import DButton from "discourse/components/d-button";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ListSetting from "select-kit/components/list-setting";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class TagGroupList extends Component {
|
||||
@discourseComputed("value")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class TagList extends Component {
|
||||
@discourseComputed("value")
|
||||
|
|
|
@ -4,8 +4,8 @@ import { action } from "@ember/object";
|
|||
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
|
||||
import DButton from "discourse/components/d-button";
|
||||
import concatClass from "discourse/helpers/concat-class";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import highlightHTML from "discourse/lib/highlight-html";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
|
||||
export default class SiteTextSummary extends Component {
|
||||
@action
|
||||
|
|
|
@ -8,8 +8,8 @@ import { htmlSafe } from "@ember/template";
|
|||
import PluginOutlet from "discourse/components/plugin-outlet";
|
||||
import concatClass from "discourse/helpers/concat-class";
|
||||
import icon from "discourse/helpers/d-icon";
|
||||
import escape from "discourse-common/lib/escape";
|
||||
import { iconHTML } from "discourse-common/lib/icon-library";
|
||||
import escape from "discourse/lib/escape";
|
||||
import { iconHTML } from "discourse/lib/icon-library";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
const MAX_COMPONENTS = 4;
|
||||
|
|
|
@ -4,7 +4,7 @@ import { equal, gt, gte } from "@ember/object/computed";
|
|||
import { service } from "@ember/service";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import DeleteThemesConfirm from "discourse/components/modal/delete-themes-confirm";
|
||||
import discourseComputed, { bind } from "discourse-common/utils/decorators";
|
||||
import discourseComputed, { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import { COMPONENTS, THEMES } from "admin/models/theme";
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ import Component from "@ember/component";
|
|||
import { action } from "@ember/object";
|
||||
import { empty, reads } from "@ember/object/computed";
|
||||
import { classNames } from "@ember-decorators/component";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
|
||||
@classNames("value-list")
|
||||
export default class ValueList extends Component {
|
||||
|
|
|
@ -6,7 +6,7 @@ import { isEmpty } from "@ember/utils";
|
|||
import { classNames, tagName } from "@ember-decorators/component";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import WatchedWord from "admin/models/watched-word";
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ import { gt, readOnly } from "@ember/object/computed";
|
|||
import { service } from "@ember/service";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { bind } from "discourse-common/utils/decorators";
|
||||
import { bind } from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class WebhookEvents extends Component {
|
||||
|
|
|
@ -5,7 +5,7 @@ import { service } from "@ember/service";
|
|||
import { isBlank } from "@ember/utils";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ApiKeyUrlsModal from "../components/modal/api-key-urls";
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@ import { service } from "@ember/service";
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { computedI18n, setting } from "discourse/lib/computed";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminBackupsIndexController extends Controller {
|
||||
|
|
|
@ -5,7 +5,7 @@ import { service } from "@ember/service";
|
|||
import { isNone } from "@ember/utils";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import BadgePreviewModal from "../../components/modal/badge-preview";
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import Controller from "@ember/controller";
|
||||
import { action, computed } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import discourseLater from "discourse/lib/later";
|
||||
import { clipboardCopy } from "discourse/lib/utilities";
|
||||
import discourseLater from "discourse-common/lib/later";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminCustomizeColorsShowController extends Controller {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import Controller from "@ember/controller";
|
||||
import EmberObject, { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ColorSchemeSelectBaseModal from "admin/components/modal/color-scheme-select-base";
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import Controller from "@ember/controller";
|
||||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminCustomizeEmailStyleEditController extends Controller {
|
||||
|
|
|
@ -2,8 +2,8 @@ import Controller, { inject as controller } from "@ember/controller";
|
|||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { bufferedProperty } from "discourse/mixins/buffered-content";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminCustomizeEmailTemplatesEditController extends Controller.extend(
|
||||
|
|
|
@ -2,7 +2,7 @@ import Controller from "@ember/controller";
|
|||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { url } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminCustomizeThemesEditController extends Controller {
|
||||
|
|
|
@ -12,8 +12,8 @@ import { service } from "@ember/service";
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { url } from "discourse/lib/computed";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ThemeSettingsEditor from "admin/components/theme-settings-editor";
|
||||
import { COMPONENTS, THEMES } from "admin/models/theme";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import Controller from "@ember/controller";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { THEMES } from "admin/models/theme";
|
||||
|
||||
export default class AdminCustomizeThemesController extends Controller {
|
||||
|
|
|
@ -2,9 +2,9 @@ import { inject as controller } from "@ember/controller";
|
|||
import { computed } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { setting } from "discourse/lib/computed";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminDashboard from "admin/models/admin-dashboard";
|
||||
import Report from "admin/models/report";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { computed } from "@ember/object";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import AdminDashboardTabController from "./admin-dashboard-tab";
|
||||
|
||||
export default class AdminDashboardModerationController extends AdminDashboardTabController {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import Controller from "@ember/controller";
|
||||
import { action, get } from "@ember/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
|
||||
export default class AdminDashboardReportsController extends Controller {
|
||||
filter = null;
|
||||
|
|
|
@ -2,7 +2,7 @@ import Controller, { inject as controller } from "@ember/controller";
|
|||
import { action, computed } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { setting } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import AdminDashboard from "admin/models/admin-dashboard";
|
||||
import VersionCheck from "admin/models/version-check";
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { action } from "@ember/object";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
|
||||
|
||||
export default class AdminEmailBouncedController extends AdminEmailLogsController {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { action } from "@ember/object";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
|
||||
import IncomingEmail from "admin/models/incoming-email";
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { action } from "@ember/object";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
|
||||
import IncomingEmail from "admin/models/incoming-email";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
|
||||
|
||||
export default class AdminEmailSentController extends AdminEmailLogsController {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import AdminEmailLogsController from "admin/controllers/admin-email-logs";
|
||||
|
||||
export default class AdminEmailSkippedController extends AdminEmailLogsController {
|
||||
|
|
|
@ -2,7 +2,7 @@ import Controller, { inject as controller } from "@ember/controller";
|
|||
import { action } from "@ember/object";
|
||||
import { alias } from "@ember/object/computed";
|
||||
import { service } from "@ember/service";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class AdminEmbeddingIndexController extends Controller {
|
||||
@service router;
|
||||
|
|
|
@ -2,10 +2,10 @@ import Controller from "@ember/controller";
|
|||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { exportEntity } from "discourse/lib/export-csv";
|
||||
import { outputExportResult } from "discourse/lib/export-result";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ScreenedIpAddress from "admin/models/screened-ip-address";
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ import Controller from "@ember/controller";
|
|||
import EmberObject, { action } from "@ember/object";
|
||||
import { scheduleOnce } from "@ember/runloop";
|
||||
import { service } from "@ember/service";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { exportEntity } from "discourse/lib/export-csv";
|
||||
import { outputExportResult } from "discourse/lib/export-result";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminStaffActionLogComponent from "../components/modal/staff-action-log-change";
|
||||
import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details";
|
||||
|
|
|
@ -3,9 +3,9 @@ import { action } from "@ember/object";
|
|||
import { or } from "@ember/object/computed";
|
||||
import { service } from "@ember/service";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { clipboardCopy } from "discourse/lib/utilities";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import Permalink from "admin/models/permalink";
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import Controller from "@ember/controller";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class AdminReportsShowController extends Controller {
|
||||
queryParams = ["start_date", "end_date", "filters", "chart_grouping", "mode"];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import Controller, { inject as controller } from "@ember/controller";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class AdminSiteSettingsCategoryController extends Controller {
|
||||
@controller adminSiteSettings;
|
||||
|
|
|
@ -3,9 +3,9 @@ import { action } from "@ember/object";
|
|||
import { alias } from "@ember/object/computed";
|
||||
import { service } from "@ember/service";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import { debounce } from "discourse/lib/decorators";
|
||||
import SiteSettingFilter from "discourse/lib/site-setting-filter";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import { debounce } from "discourse-common/utils/decorators";
|
||||
|
||||
export default class AdminSiteSettingsController extends Controller {
|
||||
@service router;
|
||||
|
|
|
@ -2,8 +2,8 @@ import Controller from "@ember/controller";
|
|||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { bufferedProperty } from "discourse/mixins/buffered-content";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminSiteTextEdit extends Controller.extend(
|
||||
|
|
|
@ -2,8 +2,8 @@ import { tracked } from "@glimmer/tracking";
|
|||
import Controller from "@ember/controller";
|
||||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { disableImplicitInjections } from "discourse/lib/implicit-injections";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import ReseedModal from "admin/components/modal/reseed";
|
||||
|
||||
let lastSearch;
|
||||
|
|
|
@ -4,9 +4,9 @@ import { alias, empty, sort } from "@ember/object/computed";
|
|||
import { next } from "@ember/runloop";
|
||||
import { service } from "@ember/service";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { grantableBadges } from "discourse/lib/grant-badge-utils";
|
||||
import UserBadge from "discourse/models/user-badge";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ import { ajax } from "discourse/lib/ajax";
|
|||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";
|
||||
import { fmt, propertyNotEqual, setting } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import DiscourseURL, { userPath } from "discourse/lib/url";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
import DeletePostsConfirmationModal from "../components/modal/delete-posts-confirmation";
|
||||
|
|
|
@ -4,9 +4,9 @@ import { action, computed } from "@ember/object";
|
|||
import { service } from "@ember/service";
|
||||
import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";
|
||||
import { computedI18n, setting } from "discourse/lib/computed";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import discourseComputed, { bind } from "discourse/lib/decorators";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
import discourseComputed, { bind } from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import BulkUserDeleteConfirmation from "admin/components/bulk-user-delete-confirmation";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
|
|
|
@ -5,7 +5,7 @@ import { schedule } from "@ember/runloop";
|
|||
import { service } from "@ember/service";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { fmt } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import WatchedWordTestingModal from "admin/components/modal/watched-word-testing";
|
||||
import WatchedWord from "admin/models/watched-word";
|
||||
|
|
|
@ -2,8 +2,8 @@ import Controller from "@ember/controller";
|
|||
import EmberObject, { action } from "@ember/object";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import { observes } from "@ember-decorators/object";
|
||||
import discourseDebounce from "discourse/lib/debounce";
|
||||
import { INPUT_DELAY } from "discourse-common/config/environment";
|
||||
import discourseDebounce from "discourse-common/lib/debounce";
|
||||
|
||||
export default class AdminWatchedWordsController extends Controller {
|
||||
filter = null;
|
||||
|
|
|
@ -4,7 +4,7 @@ import { alias } from "@ember/object/computed";
|
|||
import { service } from "@ember/service";
|
||||
import { isEmpty } from "@ember/utils";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminWebHooksEditController extends Controller {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import Controller from "@ember/controller";
|
||||
import { service } from "@ember/service";
|
||||
import { dasherize } from "@ember/string";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class AdminController extends Controller {
|
||||
@service router;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { htmlSafe } from "@ember/template";
|
||||
import { registerRawHelper } from "discourse-common/lib/helpers";
|
||||
import { renderIcon } from "discourse-common/lib/icon-library";
|
||||
import { registerRawHelper } from "discourse/lib/helpers";
|
||||
import { renderIcon } from "discourse/lib/icon-library";
|
||||
|
||||
registerRawHelper("check-icon", checkIcon);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import Helper from "@ember/component/helper";
|
||||
import { htmlSafe } from "@ember/template";
|
||||
import { iconHTML } from "discourse-common/lib/icon-library";
|
||||
import { iconHTML } from "discourse/lib/icon-library";
|
||||
|
||||
export default class DispositionIcon extends Helper {
|
||||
compute([disposition]) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { htmlHelper } from "discourse/lib/helpers";
|
||||
import { escapeExpression } from "discourse/lib/utilities";
|
||||
import { htmlHelper } from "discourse-common/lib/helpers";
|
||||
|
||||
export default htmlHelper((str) =>
|
||||
escapeExpression(str).replace(/\n/g, "<br>")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { registerRawHelper } from "discourse-common/lib/helpers";
|
||||
import { registerRawHelper } from "discourse/lib/helpers";
|
||||
|
||||
registerRawHelper("value-at-tl", valueAtTl);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { dependentKeyCompat } from "@ember/object/compat";
|
||||
import { isPresent } from "@ember/utils";
|
||||
import { deepEqual } from "discourse-common/lib/object";
|
||||
import { deepEqual } from "discourse/lib/object";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class SettingObjectHelper {
|
||||
|
|
|
@ -10,8 +10,8 @@ import JsonSchemaEditorModal from "discourse/components/modal/json-schema-editor
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import { fmt, propertyNotEqual } from "discourse/lib/computed";
|
||||
import { SITE_SETTING_REQUIRES_CONFIRMATION_TYPES } from "discourse/lib/constants";
|
||||
import { deepEqual } from "discourse/lib/object";
|
||||
import { splitString } from "discourse/lib/utilities";
|
||||
import { deepEqual } from "discourse-common/lib/object";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import SiteSettingDefaultCategoriesModal from "../components/modal/site-setting-default-categories";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { cached, tracked } from "@glimmer/tracking";
|
||||
import { capitalize, dasherize } from "@ember/string";
|
||||
import { snakeCaseToCamelCase } from "discourse-common/lib/case-converter";
|
||||
import { snakeCaseToCamelCase } from "discourse/lib/case-converter";
|
||||
import I18n, { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminPlugin {
|
||||
|
|
|
@ -3,11 +3,11 @@ import { Promise } from "rsvp";
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import { propertyNotEqual } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import { userPath } from "discourse/lib/url";
|
||||
import Group from "discourse/models/group";
|
||||
import User from "discourse/models/user";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class AdminUser extends User {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { computed } from "@ember/object";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import { fmt } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import RestModel from "discourse/models/rest";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
|
||||
export default class ApiKey extends RestModel {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { not } from "@ember/object/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class BackupStatus extends EmberObject {
|
||||
@not("restoreEnabled") restoreDisabled;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { observes, on } from "@ember-decorators/object";
|
||||
import { propertyNotEqual } from "discourse/lib/computed";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class ColorSchemeColor extends EmberObject {
|
||||
|
|
|
@ -3,7 +3,7 @@ import ArrayProxy from "@ember/array/proxy";
|
|||
import EmberObject from "@ember/object";
|
||||
import { not } from "@ember/object/computed";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ColorSchemeColor from "admin/models/color-scheme-color";
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
|
||||
export default class EmailLog extends EmberObject {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import discourseComputed from "discourse/lib/decorators";
|
||||
import RestModel from "discourse/models/rest";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class FlagType extends RestModel {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import DiscourseURL from "discourse/lib/url";
|
||||
import Category from "discourse/models/category";
|
||||
import RestModel from "discourse/models/rest";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
|
||||
export default class Permalink extends RestModel {
|
||||
static findAll(filter) {
|
||||
|
|
|
@ -2,7 +2,10 @@ import EmberObject from "@ember/object";
|
|||
import { isEmpty } from "@ember/utils";
|
||||
import { renderAvatar } from "discourse/helpers/user-avatar";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { durationTiny, number } from "discourse/lib/formatter";
|
||||
import getURL from "discourse/lib/get-url";
|
||||
import { makeArray } from "discourse/lib/helpers";
|
||||
import round from "discourse/lib/round";
|
||||
import {
|
||||
escapeExpression,
|
||||
|
@ -10,9 +13,6 @@ import {
|
|||
formatUsername,
|
||||
toNumber,
|
||||
} from "discourse/lib/utilities";
|
||||
import getURL from "discourse-common/lib/get-url";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import I18n, { i18n } from "discourse-i18n";
|
||||
|
||||
// Change this line each time report format change
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class ScreenedEmail extends EmberObject {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { equal } from "@ember/object/computed";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class ScreenedIpAddress extends EmberObject {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
|
||||
export default class ScreenedUrl extends EmberObject {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import { alias } from "@ember/object/computed";
|
||||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import SettingObjectHelper from "admin/lib/setting-object-helper";
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import { escapeExpression } from "discourse/lib/utilities";
|
||||
import RestModel from "discourse/models/rest";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import AdminUser from "admin/models/admin-user";
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ import { get } from "@ember/object";
|
|||
import { gt, or } from "@ember/object/computed";
|
||||
import { isBlank, isEmpty } from "@ember/utils";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
import RestModel from "discourse/models/rest";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import { i18n } from "discourse-i18n";
|
||||
import ThemeSettings from "admin/models/theme-settings";
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import EmberObject from "@ember/object";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import discourseComputed from "discourse/lib/decorators";
|
||||
|
||||
export default class Tl3Requirements extends EmberObject {
|
||||
@discourseComputed("days_visited", "time_period")
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user