diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 8953d4e7c5b..65e7f3f0124 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -11,6 +11,8 @@ export default Ember.Controller.extend({
versionCheck: null,
problemsCheckMinutes: 1,
+ showVersionChecks: Discourse.computed.setting('version_checks'),
+
foundProblems: function() {
return(Discourse.User.currentProp('admin') && this.get('problems') && this.get('problems').length > 0);
}.property('problems'),
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
index df080246a57..7761b057b86 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -10,11 +10,13 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
loading: false,
content: [],
- clearBlock: function(row){
- row.clearBlock().then(function(){
- // feeling lazy
- window.location.reload();
- });
+ actions: {
+ clearBlock: function(row){
+ row.clearBlock().then(function(){
+ // feeling lazy
+ window.location.reload();
+ });
+ }
},
show: function() {
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list.js.es6
index 4fc037976fe..34ac64c2bf2 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list.js.es6
@@ -13,6 +13,7 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
content: null,
loading: false,
+ mustApproveUsers: Discourse.computed.setting('must_approve_users'),
queryNew: Em.computed.equal('query', 'new'),
queryPending: Em.computed.equal('query', 'pending'),
queryHasApproval: Em.computed.or('queryNew', 'queryPending'),
diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index c4f138d7c73..99421f9f267 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -1,5 +1,5 @@
- {{#if Discourse.SiteSettings.version_checks}}
+ {{#if showVersionChecks}}
{{partial 'admin/templates/version_checks'}}
{{/if}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_emails.js.handlebars
index 94e2e42677d..d4e78bce6ac 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails.js.handlebars
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails.js.handlebars
@@ -17,7 +17,7 @@
- {{view Discourse.ScreenedEmailsListView contentBinding="controller"}}
+ {{view 'screened-emails-list' content=controller}}
{{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.js.handlebars
index 3c34f8d4ffb..052bb46adab 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.js.handlebars
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.js.handlebars
@@ -19,7 +19,7 @@
- {{view Discourse.ScreenedIpAddressesListView contentBinding="controller"}}
+ {{view 'screened-ip-addresses-list' content=controller}}
{{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_urls.js.handlebars
index 09893ba7041..4753fb6c6b5 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.js.handlebars
+++ b/app/assets/javascripts/admin/templates/logs/screened_urls.js.handlebars
@@ -15,7 +15,7 @@
- {{view Discourse.ScreenedUrlsListView contentBinding="controller"}}
+ {{view 'screened-urls-list' content=controller}}
{{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars b/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars
index 192531a6d61..27834e21a1e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars
@@ -48,7 +48,7 @@
{{i18n loading}}
{{else}}
{{#if model.length}}
- {{view Discourse.StaffActionLogsListView contentBinding="controller"}}
+ {{view "staff-action-logs-list" content=controller}}
{{else}}
{{i18n search.no_results}}
{{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings_category.js.handlebars b/app/assets/javascripts/admin/templates/site_settings_category.js.handlebars
index 1a93c299e17..c7a762e2964 100644
--- a/app/assets/javascripts/admin/templates/site_settings_category.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings_category.js.handlebars
@@ -1,5 +1,5 @@
{{#if filteredContent.length}}
- {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemViewClass="Discourse.SiteSettingView"}}
+ {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemView="site-setting"}}
{{else}}
{{i18n admin.site_settings.no_results}}
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 4dcdb8e45bd..c8ee3b22df8 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -3,7 +3,7 @@