Skip to content

Commit 82070f7

Browse files
iamareebjamaliamareebjamal
authored
chore: Change to angle bracket syntax for sort_by (#4323)
{{sort_by}} was being treated as a composable helper and thus all builds like #4301 and mainly #4298 were breaking Some changes were reverted in #4322, but changing to {{this.sort_by}} makes it unambiguous and also octane compatible
1 parent 0292548 commit 82070f7

File tree

10 files changed

+111
-111
lines changed

10 files changed

+111
-111
lines changed

‎app/templates/account/billing/invoices/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen wide column">
2-
{{tables/default columns=columns
3-
rows=model.eventInvoices.data
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.eventInvoices.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.eventInvoices.data}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.eventInvoices.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

‎app/templates/events/import.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<Events::EventImportSection @uploadFile={{action "uploadFile"}} @importStatus={{importStatus}} @importError={{importError}} @isImporting={{isImporting}} @file={{file}} />
22
<div class="ui hidden divider"></div>
3-
<Events::ImportsHistorySection @data={{model.importJobs}} @columns={{columns}} @page={{page}} @per_page={{per_page}} @search={{search}} @sort_by={{sort_by}} @sort_dir={{sort_dir}} @filterOptions={{filterOptions}} />
3+
<Events::ImportsHistorySection @data={{this.model.importJobs}} @columns={{this.columns}} @page={{this.page}} @per_page={{this.per_page}} @search={{this.search}} @sort_by={{this.sort_by}} @sort_dir={{this.sort_dir}} @filterOptions={{this.filterOptions}} />

‎app/templates/events/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{{tables/default columns=columns
2-
rows=model.data
3-
currentPage=page
4-
pageSize=per_page
5-
searchQuery=search
6-
sortBy=sort_by
7-
sortDir=sort_dir
8-
metaData=model.meta
9-
filterOptions=filterOptions
10-
widthConstraint="eq-container"
11-
resizeMode="fluid"
12-
fillMode="equal-column"
13-
}}
1+
<Tables::Default
2+
@columns={{this.columns}}
3+
@rows={{this.model.data}}
4+
@currentPage={{this.page}}
5+
@pageSize={{this.per_page}}
6+
@searchQuery={{this.search}}
7+
@sortBy={{this.sort_by}}
8+
@sortDir={{this.sort_dir}}
9+
@metaData={{this.model.meta}}
10+
@filterOptions={{this.filterOptions}}
11+
@widthConstraint="eq-container"
12+
@resizeMode="fluid"
13+
@fillMode="equal-column" />

‎app/templates/events/view/index.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<div class="ui grid stackable">
22
<div class="eight wide column">
3-
<Events::View::Overview::EventSetupChecklist @data={{model}} />
3+
<Events::View::Overview::EventSetupChecklist @data={{this.model}} />
44
</div>
55
<div class="eight wide column">
6-
<Events::View::Overview::GeneralInfo @data={{model}} />
6+
<Events::View::Overview::GeneralInfo @data={{this.model}} />
77
</div>
88
<div class="eight wide column">
9-
<Events::View::Overview::ManageRoles @data={{model}} />
9+
<Events::View::Overview::ManageRoles @data={{this.model}} />
1010
</div>
1111
<div class="eight wide column">
12-
<Events::View::Overview::EventSponsors @data={{model.sponsors}} @columns={{columns}} @page={{page}} @per_page={{per_page}} @search={{search}} @sort_by={{sort_by}} @sort_dir={{sort_dir}} @filterOptions={{filterOptions}} />
12+
<Events::View::Overview::EventSponsors @data={{this.model.sponsors}} @columns={{this.columns}} @page={{this.page}} @per_page={{this.per_page}} @search={{this.search}} @sort_by={{this.sort_by}} @sort_dir={{this.sort_dir}} @filterOptions={{this.filterOptions}} />
1313
</div>
1414
<div class="eight wide column">
1515
<Events::View::Overview::EventApps />
1616
</div>
1717
<div class="eight wide column">
18-
<Events::View::Overview::EventTickets @data={{model}} />
18+
<Events::View::Overview::EventTickets @data={{this.model}} />
1919
</div>
2020
</div>

‎app/templates/events/view/sessions/list.hbs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<div class="sixteen wide column">
2-
{{tables/default columns=columns
3-
rows=model.sessions.data
4-
feedbacks=model.feedbacks
5-
currentPage=page
6-
pageSize=per_page
7-
searchQuery=search
8-
sortBy=sort_by
9-
sortDir=sort_dir
10-
metaData=model.sessions.meta
11-
filterOptions=filterOptions
12-
widthConstraint="eq-container"
13-
resizeMode="fluid"
14-
fillMode="equal-column"
15-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.sessions.data}}
5+
@feedbacks={{this.model.feedbacks}}
6+
@currentPage={{this.page}}
7+
@pageSize={{this.per_page}}
8+
@searchQuery={{this.search}}
9+
@sortBy={{this.sort_by}}
10+
@sortDir={{this.sort_dir}}
11+
@metaData={{this.model.sessions.meta}}
12+
@filterOptions={{this.filterOptions}}
13+
@widthConstraint="eq-container"
14+
@resizeMode="fluid"
15+
@fillMode="equal-column" />
1616
</div>

‎app/templates/events/view/speakers/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen wide column">
2-
{{tables/default columns=columns
3-
rows=model.data
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.data}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

‎app/templates/events/view/tickets/access-codes/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen wide column">
2-
{{tables/default columns=columns
3-
rows=model.data
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.data}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

‎app/templates/events/view/tickets/attendees/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen column wide">
2-
{{tables/default columns=columns
3-
rows=model.data
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.data}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

‎app/templates/events/view/tickets/discount-codes/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen wide column">
2-
{{tables/default columns=columns
3-
rows=model.data
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.model.data}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

‎app/templates/events/view/tickets/orders/list.hbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="sixteen column wide">
2-
{{tables/default columns=columns
3-
rows=rows
4-
currentPage=page
5-
pageSize=per_page
6-
searchQuery=search
7-
sortBy=sort_by
8-
sortDir=sort_dir
9-
metaData=model.meta
10-
filterOptions=filterOptions
11-
widthConstraint="eq-container"
12-
resizeMode="fluid"
13-
fillMode="equal-column"
14-
}}
2+
<Tables::Default
3+
@columns={{this.columns}}
4+
@rows={{this.rows}}
5+
@currentPage={{this.page}}
6+
@pageSize={{this.per_page}}
7+
@searchQuery={{this.search}}
8+
@sortBy={{this.sort_by}}
9+
@sortDir={{this.sort_dir}}
10+
@metaData={{this.model.meta}}
11+
@filterOptions={{this.filterOptions}}
12+
@widthConstraint="eq-container"
13+
@resizeMode="fluid"
14+
@fillMode="equal-column" />
1515
</div>

0 commit comments

Comments
 (0)