From 08723f00c60229e4d7804f9a7473b147aab3d57b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 15 Jul 2013 11:28:41 -0400
Subject: [PATCH] FIX: Bugs on Admin User approval interface

---
 .../admin/controllers/admin_users_list_controller.js   | 10 ++++++----
 .../admin/templates/users_list.js.handlebars           |  2 +-
 .../javascripts/discourse/helpers/i18n_helpers.js      |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
index 6a95089a8d2..c9e8bd93907 100644
--- a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js
@@ -13,6 +13,10 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
   content: null,
   loading: false,
 
+  queryNew: Em.computed.equal('query', 'new'),
+  queryPending: Em.computed.equal('query', 'pending'),
+  queryHasApproval: Em.computed.or('queryNew', 'queryPending'),
+
   /**
     Triggered when the selectAll property is changed
 
@@ -58,10 +62,8 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
     @property showApproval
   **/
   showApproval: function() {
-    if (!Discourse.SiteSettings.must_approve_users) return false;
-    if (this.get('query') === 'new') return true;
-    if (this.get('query') === 'pending') return true;
-  }.property('query'),
+    return Discourse.SiteSettings.must_approve_users && this.get('queryHasApproval');
+  }.property('queryPending'),
 
   /**
     How many users are currently selected
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 48b26a37244..0aa21e61b35 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -53,7 +53,7 @@
 
       {{#each model}}
         <tr {{bindAttr class="selected"}}>
-          {{#if showApproval}}
+          {{#if controller.showApproval}}
             <td>
               {{#if can_approve}}
                 {{view Ember.Checkbox checkedBinding="selected"}}
diff --git a/app/assets/javascripts/discourse/helpers/i18n_helpers.js b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
index 4a9433514bb..92e2335c883 100644
--- a/app/assets/javascripts/discourse/helpers/i18n_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
@@ -43,7 +43,7 @@ Ember.Handlebars.registerHelper('i18n', function(property, options) {
 Ember.Handlebars.registerHelper('countI18n', function(key, options) {
   var view = Discourse.View.extend({
     tagName: 'span',
-    shouldRerender: Discourse.View.renderIfChanged('countChanged'),
+    shouldRerender: Discourse.View.renderIfChanged('count'),
 
     render: function(buffer) {
       buffer.push(I18n.t(key, { count: this.get('count') }));