IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Deprecation: Remove controller from templates

Browse Source
This commit is contained in:
Robin Ward
2016-05-09 15:15:39 -04:00
parent c7beecd8e3
commit 995c01fb58
24 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/emojis.hbs
View File

@@ -5,7 +5,7 @@
<p>{{emoji-uploader done="emojiUploaded"}}</p>
{{#if controller}}
{{#if model}}
<div class="span8">
<table id="custom_emoji">
<thead>
@@ -16,7 +16,7 @@
</tr>
</thead>
<tbody>
{{#each controller as |e|}}
{{#each model as |e|}}
<tr>
<th><img class="emoji" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
<th>:{{e.name}}:</th>

4
app/assets/javascripts/admin/templates/groups_type.hbs
View File

@@ -2,7 +2,7 @@
<div class='content-list span6'>
<h3>{{i18n 'admin.groups.edit'}}</h3>
<ul>
{{#each controller as |group|}}
{{#each model as |group|}}
<li>
{{#link-to "adminGroup" group.type group.name}}{{group.name}}
{{#if group.userCountDisplay}}
@@ -13,7 +13,7 @@
{{/each}}
</ul>
<div class='controls'>
{{#if controller.isAuto}}
{{#if isAuto}}
{{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
{{else}}
{{#link-to 'adminGroup' 'new' class="btn"}}

2
app/assets/javascripts/admin/templates/logs/screened_emails.hbs
View File

@@ -19,7 +19,7 @@
<div class="clearfix"></div>
</div>
{{screened-emails-list content=controller}}
{{screened-emails-list content=model}}
</div>
{{else}}

2
app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
View File

@@ -24,7 +24,7 @@
<div class="clearfix"></div>
</div>
{{screened-ip-addresses-list content=controller}}
{{screened-ip-addresses-list content=model}}
</div>
{{else}}

2
app/assets/javascripts/admin/templates/logs/screened_urls.hbs
View File

@@ -16,7 +16,7 @@
<div class="clearfix"></div>
</div>
{{screened-urls-list content=controller}}
{{screened-urls-list content=model}}
</div>
{{else}}
{{i18n 'search.no_results'}}

2
app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
View File

@@ -50,7 +50,7 @@
{{#conditional-loading-spinner condition=loading}}
{{#if model.length}}
{{staff-action-logs-list content=controller}}
{{staff-action-logs-list content=model}}
{{else}}
{{i18n 'search.no_results'}}
{{/if}}

2
app/assets/javascripts/admin/templates/permalinks.hbs
View File

@@ -17,7 +17,7 @@
<div class="col heading actions"></div>
<div class="clearfix"></div>
</div>
{{permalinks-list content=controller}}
{{permalinks-list content=model}}
</div>
{{else}}
{{i18n 'search.no_results'}}

2
app/assets/javascripts/admin/templates/plugins-index.hbs
View File

@@ -21,7 +21,7 @@
</tr>
</thead>
<tbody>
{{#each controller as |plugin|}}
{{#each model as |plugin|}}
<tr>
<td>
{{#if plugin.url}}

2
app/assets/javascripts/admin/templates/site-settings.hbs
View File

@@ -14,7 +14,7 @@
<div class="admin-nav pull-left">
<ul class="nav nav-stacked">
{{#each controller as |category|}}
{{#each model as |category|}}
{{#link-to 'adminSiteSettingsCategory' category.nameKey tagName='li' class=category.nameKey}}
{{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
{{category.name}}

4
app/assets/javascripts/admin/templates/user_badges.hbs
View File

@@ -16,13 +16,13 @@
<form class="form-horizontal">
<div>
<label>{{i18n 'admin.badges.badge'}}</label>
{{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="name"}}
{{combo-box valueAttribute="id" value=selectedBadgeId content=grantableBadges nameProperty="name"}}
</div>
<label>
<label>{{i18n 'admin.badges.reason'}}</label>
{{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
</label>
<button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
<button class='btn btn-primary' {{action "grantBadge" selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
</form>
{{/if}}

2
app/assets/javascripts/admin/templates/users-list-show.hbs
View File

@@ -43,7 +43,7 @@
{{#each model as |user|}}
<tr class="{{user.selected}} {{unless user.active 'not-activated'}}">
{{#if controller.showApproval}}
{{#if showApproval}}
<td>
{{#if user.can_approve}}
{{input type="checkbox" checked=user.selected}}