Skip to content

Commit

Permalink
Merge pull request RocketChat#209 from Shailesh351/sb_admin_rooms_users
Browse files Browse the repository at this point in the history
Set Admin Rooms Users Similar to Upstream
  • Loading branch information
ear-dev authored Apr 1, 2020
2 parents b3fc63e + f05b77f commit 2f49926
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion client/importPackages.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import '../app/spotify/client';
import '../app/tokenpass/client';
import '../app/ui';
import '../app/ui-account';
// import '../app/ui-admin/client';
import '../app/ui-admin/client';
import '../app/ui-clean-history';
import '../app/ui-flextab';
import '../app/ui-login';
Expand Down
16 changes: 0 additions & 16 deletions client/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,22 +233,6 @@ FlowRouter.route('/setup-wizard/:step?', {
},
});

FlowRouter.route('/admin/users', {
name: 'admin-users',
async action() {
await import('../app/ui-admin/client/users/views');
BlazeLayout.render('main', { center: 'adminUsers' });
},
});

FlowRouter.route('/admin/rooms', {
name: 'admin-rooms',
async action() {
await import('../app/ui-admin/client/rooms/views');
BlazeLayout.render('main', { center: 'adminRooms' });
},
});

const style = 'overflow: hidden; flex: 1 1 auto; height: 1%;';
FlowRouter.route('/admin/:group?', {
name: 'admin',
Expand Down

0 comments on commit 2f49926

Please sign in to comment.