DEV: Fix imports in tests, minor clean up (#93)

Still doesn't work with ember cli though.
This commit is contained in:
Jarek Radosz
2021-11-14 14:14:49 +01:00
committed by GitHub
parent 08dd442c1c
commit 369ca14711
10 changed files with 77 additions and 106 deletions
@@ -2,11 +2,7 @@ import I18n from "I18n";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { popupAjaxError } from "discourse/lib/ajax-error";
import EmberObject from "@ember/object";
import {
default as computed,
observes,
on,
} from "discourse-common/utils/decorators";
import computed, { observes, on } from "discourse-common/utils/decorators";
export default Ember.Controller.extend(ModalFunctionality, {
@on("init")
@@ -1,6 +1,6 @@
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { default as computed, on } from "discourse-common/utils/decorators";
import computed, { on } from "discourse-common/utils/decorators";
export default Ember.Controller.extend(ModalFunctionality, {
saveDisabled: false,
@@ -2,7 +2,7 @@ import I18n from "I18n";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { default as computed, on } from "discourse-common/utils/decorators";
import computed, { on } from "discourse-common/utils/decorators";
export default Ember.Controller.extend(ModalFunctionality, {
@on("init")
+1 -4
View File
@@ -1,10 +1,7 @@
import I18n from "I18n";
import RestModel from "discourse/models/rest";
import Category from "discourse/models/category";
import {
default as computed,
observes,
} from "discourse-common/utils/decorators";
import computed, { observes } from "discourse-common/utils/decorators";
export default RestModel.extend({
@computed("channel.provider")
@@ -45,14 +45,14 @@
<div class="modal-footer">
{{d-button id="save-channel"
class="btn-primary btn-large"
action="save"
action=(action "save")
title="chat_integration.edit_channel_modal.save"
label="chat_integration.edit_channel_modal.save"
disabled=saveDisabled
}}
{{d-button class="btn-large"
action="cancel"
action=(action "cancel")
title="chat_integration.edit_channel_modal.cancel"
label="chat_integration.edit_channel_modal.cancel"
}}
@@ -105,7 +105,7 @@
<div class="modal-footer">
{{d-button id="save-rule"
class="btn-primary btn-large"
action="save"
action=(action "save")
actionParam=model.rule
title="chat_integration.edit_rule_modal.save"
label="chat_integration.edit_rule_modal.save"