fix users template rendering

TryGhost · May 22, 2015 · f6a116b · f6a116b
1 parent f2f10ac
commit f6a116b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 21 deletions.
diff --git a/core/client/app/routes/settings/users.js b/core/client/app/routes/settings/users.js
diff --git a/core/client/app/routes/settings/users/index.js b/core/client/app/routes/settings/users/index.js
@@ -47,6 +47,10 @@ UsersIndexRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, Pagi
         });
     },
 
+    renderTemplate: function () {
+        this.render('settings/users/index', {into: 'application'});
+    },
+
     actions: {
         reload: function () {
             this.refresh();

diff --git a/core/client/app/routes/settings/users/user.js b/core/client/app/routes/settings/users/user.js
@@ -49,6 +49,10 @@ var SettingsUserRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings
         this._super();
     },
 
+    renderTemplate: function () {
+        this.render('settings/users/user', {into: 'application'});
+    },
+
     actions: {
         save: function () {
             this.get('controller').send('save');

diff --git a/core/client/app/templates/settings/users.hbs b/core/client/app/templates/settings/users.hbs
diff --git a/core/client/app/templates/settings/users/index.hbs b/core/client/app/templates/settings/users/index.hbs
@@ -1,4 +1,3 @@
-{{#view "settings/users/users-list-view" class="users-list-wrapper js-users-list-view"}}
     <header class="view-header">
         <h1 class="view-title">Team</h1>
         <section class="view-actions">
@@ -67,5 +66,3 @@
     </section>
 
     </section>{{! .content settings-users }}
-
-{{/view}}
diff --git a/core/client/app/views/settings/users.js b/core/client/app/views/settings/users.js
diff --git a/core/client/app/views/settings/users/index.js b/core/client/app/views/settings/users/index.js
@@ -0,0 +1,5 @@
+import BaseView from 'ghost/views/settings/content-base';
+
+var SettingsUserIndexView = BaseView.extend();
+
+export default SettingsUserIndexView;
diff --git a/core/client/app/views/settings/users/user.js b/core/client/app/views/settings/users/user.js
@@ -1,5 +1,6 @@
-import Ember from 'ember';
-var SettingsUserView = Ember.View.extend({
+import BaseView from 'ghost/views/settings/content-base';
+
+var SettingsUserView = BaseView.extend({
     currentUser: Ember.computed.alias('controller.session.user'),
 
     isNotOwnProfile: Ember.computed('controller.user.id', 'currentUser.id', function () {