From 1bf2b236cb4b051a2296ab698e2c044c020eef09 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 20 Nov 2015 15:07:04 -0500
Subject: [PATCH] FIX: Admin section wasn't correctly highlighting some routes

---
 .../javascripts/admin/routes/admin-customize-index.js.es6   | 2 +-
 .../javascripts/admin/routes/admin-users-list-index.js.es6  | 2 +-
 app/assets/javascripts/admin/routes/admin-users-list.js.es6 | 6 +++---
 app/assets/javascripts/admin/templates/admin.hbs            | 6 +++---
 app/assets/javascripts/admin/templates/customize.hbs        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
index 725b9fa8dd6..45cb6e21fbe 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Route.extend({
   beforeModel() {
-    this.replaceWith('adminCustomize.colors');
+    this.transitionTo('adminCustomize.colors');
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
index 09c09197d5d..4f2d30218e4 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   beforeModel: function() {
-    this.replaceWith('adminUsersList.show', 'active');
+    this.transitionTo('adminUsersList.show', 'active');
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
index 1a2b08d29ea..e76040b098e 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
@@ -4,15 +4,15 @@ import { outputExportResult } from 'discourse/lib/export-result';
 export default Discourse.Route.extend({
 
   actions: {
-    exportUsers: function() {
+    exportUsers() {
       exportEntity('user_list').then(outputExportResult);
     },
 
-    sendInvites: function() {
+    sendInvites() {
       this.transitionTo('userInvited', Discourse.User.current());
     },
 
-    deleteUser: function(user) {
+    deleteUser(user) {
       Discourse.AdminUser.create(user).destroy({ deletePosts: true });
     }
   }
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 6c3008dd282..13afd577f77 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -7,9 +7,9 @@
         {{#if currentUser.admin}}
           {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
         {{/if}}
-        {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.title'}}
+        {{nav-item route='adminUsersList' label='admin.users.title'}}
         {{#if showBadges}}
-          {{nav-item route='adminBadges.index' label='admin.badges.title'}}
+          {{nav-item route='adminBadges' label='admin.badges.title'}}
         {{/if}}
         {{#if currentUser.admin}}
           {{nav-item route='adminGroups' label='admin.groups.title'}}
@@ -18,7 +18,7 @@
         {{nav-item route='adminFlags' label='admin.flags.title'}}
         {{nav-item route='adminLogs' label='admin.logs.title'}}
         {{#if currentUser.admin}}
-          {{nav-item route='adminCustomize.colors' label='admin.customize.title'}}
+          {{nav-item route='adminCustomize' label='admin.customize.title'}}
           {{nav-item route='admin.api' label='admin.api.title'}}
           {{nav-item route='admin.backups' label='admin.backups.title'}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index adfbc08a36c..7696b34811f 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,7 +1,7 @@
 <div class='customize'>
   {{#admin-nav}}
     {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}}
-    {{nav-item route='adminCustomizeCssHtml.index' label='admin.customize.css_html.title'}}
+    {{nav-item route='adminCustomizeCssHtml' label='admin.customize.css_html.title'}}
     {{nav-item route='adminSiteText' label='admin.site_text.title'}}
     {{nav-item route='adminCustomizeEmailTemplates' label='admin.customize.email_templates.title'}}
     {{nav-item route='adminUserFields' label='admin.user_fields.title'}}