From 199584824b9b039cc5130c9016e5d0c6ca571549 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 9 Sep 2013 12:21:47 -0400
Subject: [PATCH] Don't show approval on admin user page if the site doesn't
 require approval of users (must_approve_users)

---
 .../controllers/admin_user_controller.js      |  6 ++-
 .../admin/templates/user.js.handlebars        | 48 ++++++++++---------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin_user_controller.js b/app/assets/javascripts/admin/controllers/admin_user_controller.js
index d23b49ab2..d2c0e83c4 100644
--- a/app/assets/javascripts/admin/controllers/admin_user_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_user_controller.js
@@ -22,5 +22,9 @@ Discourse.AdminUserController = Discourse.ObjectController.extend({
     });
 
     this.toggleTitleEdit();
-  }
+  },
+
+  showApproval: function() {
+    return Discourse.SiteSettings.must_approve_users;
+  }.property()
 });
diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index 474c27955..08979e4f6 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -64,32 +64,34 @@
 <section class='details'>
   <h1>{{i18n admin.user.permissions}}</h1>
 
-  <div class='display-row'>
-    <div class='field'>{{i18n admin.users.approved}}</div>
-    <div class='value'>
-      {{#if approved}}
-        {{i18n admin.user.approved_by}}
+  {{#if showApproval}}
+    <div class='display-row'>
+      <div class='field'>{{i18n admin.users.approved}}</div>
+      <div class='value'>
+        {{#if approved}}
+          {{i18n admin.user.approved_by}}
 
-        {{#linkTo 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}}
-        {{#linkTo 'adminUser' approved_by}}{{approved_by.username}}{{/linkTo}}
-      {{else}}
-        {{i18n no_value}}
-      {{/if}}
-
-    </div>
-    <div class='controls'>
-      {{#if approved}}
-        {{i18n admin.user.approve_success}}
-      {{else}}
-        {{#if can_approve}}
-          <button class='btn' {{action approve target="content"}}>
-            <i class='icon icon-ok'></i>
-            {{i18n admin.user.approve}}
-          </button>
+          {{#linkTo 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}}
+          {{#linkTo 'adminUser' approved_by}}{{approved_by.username}}{{/linkTo}}
+        {{else}}
+          {{i18n no_value}}
         {{/if}}
-      {{/if}}
+
+      </div>
+      <div class='controls'>
+        {{#if approved}}
+          {{i18n admin.user.approve_success}}
+        {{else}}
+          {{#if can_approve}}
+            <button class='btn' {{action approve target="content"}}>
+              <i class='icon icon-ok'></i>
+              {{i18n admin.user.approve}}
+            </button>
+          {{/if}}
+        {{/if}}
+      </div>
     </div>
-  </div>
+  {{/if}}
 
   <div class='display-row'>
     <div class='field'>{{i18n admin.users.active}}</div>