Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Update linting #647

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{#if
(or
siteSettings.sort_categories_by_event_start_date_enabled
siteSettings.disable_resorting_on_categories_enabled
this.siteSettings.sort_categories_by_event_start_date_enabled
this.siteSettings.disable_resorting_on_categories_enabled
)
}}
<section>
<h3>{{i18n
"discourse_post_event.category.settings_sections.event_sorting"
}}</h3>

{{#if siteSettings.sort_categories_by_event_start_date_enabled}}
{{#if this.siteSettings.sort_categories_by_event_start_date_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
Expand All @@ -23,7 +23,7 @@
</section>
{{/if}}

{{#if siteSettings.disable_resorting_on_categories_enabled}}
{{#if this.siteSettings.disable_resorting_on_categories_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<td>{{holiday.date}}</td>
<td>{{holiday.name}}</td>
<td>{{this.holiday.date}}</td>
<td>{{this.holiday.name}}</td>
<td>
{{#if isHolidayDisabled}}
{{#if this.isHolidayDisabled}}
<DButton
@action={{action "enableHoliday" holiday region_code}}
@action={{action "enableHoliday" this.holiday this.region_code}}
@label="discourse_calendar.enable_holiday"
/>
{{else}}
<DButton
@action={{action "disableHoliday" holiday region_code}}
@action={{action "disableHoliday" this.holiday this.region_code}}
@label="discourse_calendar.disable_holiday"
/>
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export default class PostEventBulkInvite extends Component {
bulkInvite.identifier = selected[0];
this.setBulkInviteDisabled();
}

@action
updateBulkGroupInviteIdentifier(bulkInvite, _, groupNames) {
bulkInvite.identifier = groupNames[0];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export default class PostEventInviteesModal extends Component {
this.isLoading = false;
}
}

<template>
<DModal
@title={{this.title}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}}</label>
<div class="controls">
<RegionInput
@value={{model.custom_fields.holidays-region}}
@value={{this.model.custom_fields.holidays-region}}
@allowNoneRegion={{true}}
@onChange={{action "onChange"}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
{{i18n "discourse_calendar.holidays.disabled_holidays_description"}}
</p>

<ConditionalLoadingSpinner @condition={{loading}} />
<ConditionalLoadingSpinner @condition={{this.loading}} />

{{#if model.holidays}}
{{#if this.model.holidays}}
<AdminHolidaysList
@holidays={{model.holidays}}
@holidays={{this.model.holidays}}
@region_code={{this.selectedRegion}}
/>
{{/if}}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="discourse-post-event-upcoming-events">
<UpcomingEventsCalendar @events={{model}} />
<UpcomingEventsCalendar @events={{this.model}} />
</div>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.0.1",
"@discourse/lint-configs": "2.2.0",
"ember-template-lint": "6.0.0",
"eslint": "9.14.0",
"prettier": "2.8.8"
Expand Down
483 changes: 234 additions & 249 deletions pnpm-lock.yaml

Large diffs are not rendered by default.