diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml index 6d2bb97..b5c963d 100644 --- a/.github/workflows/plugin-linting.yml +++ b/.github/workflows/plugin-linting.yml @@ -41,8 +41,8 @@ jobs: shell: bash run: | yarn prettier -v - if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then - yarn prettier --list-different "assets/**/*.{scss,js,es6}" + if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" -or -name "*.hbs" \) 2> /dev/null | wc -l) ]; then + yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}" fi if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then yarn prettier --list-different "test/**/*.{js,es6}" @@ -50,7 +50,12 @@ jobs: - name: Ember template lint if: ${{ !cancelled() }} - run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts + run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts + + # Separated due to https://github.com/ember-template-lint/ember-template-lint/issues/2758 + - name: Ember template lint (admin) + if: ${{ !cancelled() }} + run: yarn ember-template-lint --no-error-on-unmatched-pattern admin/assets/javascripts - name: Rubocop if: ${{ !cancelled() }} diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs index dec200d..936d01e 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs @@ -1,4 +1,4 @@ {{#d-modal-body id="chat_integration_error_modal"}}
{{model.error_info}}-{{/d-modal-body}} +{{/d-modal-body}} \ No newline at end of file diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs index 051f08e..300a16c 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs @@ -1,12 +1,21 @@ -{{#d-modal-body id="chat-integration-edit-channel-modal" title="chat_integration.edit_channel_modal.title"}} +{{#d-modal-body + id="chat-integration-edit-channel-modal" + title="chat_integration.edit_channel_modal.title" +}}