From f8f0fb15e303649ac71e8e84f29ab273d022d0fc Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 24 Jun 2014 17:45:18 -0400
Subject: [PATCH] FIX: use the correct check isUncategorizedCategory in the js

---
 .../javascripts/discourse/controllers/edit-category.js.es6  | 6 +++---
 .../javascripts/discourse/routes/application_route.js       | 2 +-
 .../discourse/templates/modal/edit_category.js.handlebars   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index 981a1b3aae9..82b091dedc7 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -102,7 +102,7 @@ export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
 
   buttonTitle: function() {
     if (this.get('saving')) return I18n.t("saving");
-    if (this.get('isUncategorized')) return I18n.t("save");
+    if (this.get('isUncategorizedCategory')) return I18n.t("save");
     return (this.get('id') ? I18n.t("category.save") : I18n.t("category.create"));
   }.property('saving', 'id'),
 
@@ -111,8 +111,8 @@ export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
   }.property(),
 
   showDescription: function() {
-    return !this.get('isUncategorized') && this.get('id');
-  }.property('isUncategorized', 'id'),
+    return !this.get('isUncategorizedCategory') && this.get('id');
+  }.property('isUncategorizedCategory', 'id'),
 
   showPositionInput: Discourse.computed.setting('fixed_category_positions'),
 
diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js
index 2c3e29e0396..9d599853a98 100644
--- a/app/assets/javascripts/discourse/routes/application_route.js
+++ b/app/assets/javascripts/discourse/routes/application_route.js
@@ -79,7 +79,7 @@ Discourse.ApplicationRoute = Em.Route.extend({
     editCategory: function(category) {
       var router = this;
 
-      if (category.get('isUncategorized')) {
+      if (category.get('isUncategorizedCategory')) {
         Discourse.Route.showModal(router, 'editCategory', category);
         router.controllerFor('editCategory').set('selectedTab', 'general');
       } else {
diff --git a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
index b9a18d4d871..7895ac57d09 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
@@ -3,7 +3,7 @@
     <li {{bind-attr class="generalSelected:active"}}>
       <a href="#" {{action selectGeneral}}>{{i18n category.general}}</a>
     </li>
-    {{#unless isUncategorized}}
+    {{#unless isUncategorizedCategory}}
       <li {{bind-attr class="securitySelected:active"}}>
         <a href="#" {{action selectSecurity}}>{{i18n category.security}}</a>
       </li>
@@ -69,7 +69,7 @@
         </section>
       </form>
     </div>
-    {{#unless isUncategorized}}
+    {{#unless isUncategorizedCategory}}
       <div {{bind-attr class=":modal-tab :options-tab securitySelected::invisible"}}>
         <section class='field'>
           <ul class='permission-list'>