mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-24 08:09:13 -05:00
Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash
Fix Graphical Error on Admin Dashboard
This commit is contained in:
commit
a71e4d5216
3 changed files with 20 additions and 3 deletions
14
app/assets/javascripts/admin/routes/admin_flags_route.js
Normal file
14
app/assets/javascripts/admin/routes/admin_flags_route.js
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
/**
|
||||||
|
Handles routes related to viewing flags.
|
||||||
|
|
||||||
|
@class AdminFlagsRoute
|
||||||
|
@extends Discourse.Route
|
||||||
|
@namespace Discourse
|
||||||
|
@module Discourse
|
||||||
|
**/
|
||||||
|
|
||||||
|
Discourse.AdminFlagsRoute = Discourse.Route.extend({
|
||||||
|
redirect: function() {
|
||||||
|
this.transitionTo('adminFlags.active');
|
||||||
|
}
|
||||||
|
});
|
|
@ -9,6 +9,9 @@
|
||||||
Discourse.AdminUsersListRoute = Discourse.Route.extend({
|
Discourse.AdminUsersListRoute = Discourse.Route.extend({
|
||||||
renderTemplate: function() {
|
renderTemplate: function() {
|
||||||
this.render('admin/templates/users_list', {into: 'admin/templates/admin'});
|
this.render('admin/templates/users_list', {into: 'admin/templates/admin'});
|
||||||
|
},
|
||||||
|
redirect: function() {
|
||||||
|
this.transitionTo('adminUsersList.active');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -108,4 +111,4 @@ Discourse.AdminUsersListBannedRoute = Discourse.Route.extend({
|
||||||
setupController: function() {
|
setupController: function() {
|
||||||
return this.controllerFor('adminUsersList').show('banned');
|
return this.controllerFor('adminUsersList').show('banned');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -8,10 +8,10 @@
|
||||||
<li>{{#linkTo 'admin.site_settings'}}{{i18n admin.site_settings.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'admin.site_settings'}}{{i18n admin.site_settings.title}}{{/linkTo}}</li>
|
||||||
<li>{{#linkTo 'adminSiteContents'}}{{i18n admin.site_content.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'adminSiteContents'}}{{i18n admin.site_content.title}}{{/linkTo}}</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<li>{{#linkTo 'adminUsersList.active'}}{{i18n admin.users.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'adminUsersList'}}{{i18n admin.users.title}}{{/linkTo}}</li>
|
||||||
<li>{{#linkTo 'admin.groups'}}{{i18n admin.groups.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'admin.groups'}}{{i18n admin.groups.title}}{{/linkTo}}</li>
|
||||||
<li>{{#linkTo 'adminEmail'}}{{i18n admin.email.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'adminEmail'}}{{i18n admin.email.title}}{{/linkTo}}</li>
|
||||||
<li>{{#linkTo 'adminFlags.active'}}{{i18n admin.flags.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'adminFlags'}}{{i18n admin.flags.title}}{{/linkTo}}</li>
|
||||||
{{#if currentUser.admin}}
|
{{#if currentUser.admin}}
|
||||||
<li>{{#linkTo 'admin.customize'}}{{i18n admin.customize.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'admin.customize'}}{{i18n admin.customize.title}}{{/linkTo}}</li>
|
||||||
<li>{{#linkTo 'admin.api'}}{{i18n admin.api.title}}{{/linkTo}}</li>
|
<li>{{#linkTo 'admin.api'}}{{i18n admin.api.title}}{{/linkTo}}</li>
|
||||||
|
|
Loading…
Reference in a new issue