From cc257e1f5cb392835ae2f1bb64fe8ab738fa66fa Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 5 Jun 2014 17:02:15 -0400
Subject: [PATCH] Boolean site settings don't save immediately

---
 app/assets/javascripts/admin/models/site_setting.js    |  4 ----
 .../templates/site_settings/setting_bool.js.handlebars | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/models/site_setting.js b/app/assets/javascripts/admin/models/site_setting.js
index 3f227970071..ae487f0b313 100644
--- a/app/assets/javascripts/admin/models/site_setting.js
+++ b/app/assets/javascripts/admin/models/site_setting.js
@@ -23,10 +23,6 @@ Discourse.SiteSetting = Discourse.Model.extend({
     } else {
       // set the boolean value of the setting
       this.set('value', value ? 'true' : 'false');
-
-      // We save booleans right away, it's not like a text field where it makes sense to
-      // undo what you typed in.
-      this.save();
     }
 
   }.property('value'),
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars b/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
index f84fec06dc1..f74f129fdb0 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
@@ -7,3 +7,13 @@
     {{unbound description}}
   </label>
 </div>
+{{#if dirty}}
+  <div class='setting-controls'>
+    <button class='btn ok no-text' {{action save this}}><i class='fa fa-check'></i></button>
+    <button class='btn cancel no-text' {{action cancel this}}><i class='fa fa-times'></i></button>
+  </div>
+{{else}}
+  {{#if overridden}}
+    <button class='btn' href='#' {{action resetDefault this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+  {{/if}}
+{{/if}}