IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 21:27:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: JS error when login_required is enabled

Browse Source
This commit is contained in:
Régis Hanol
2014-01-20 14:41:11 +01:00
parent 76a250300a
commit 26b7bf388e
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse.js
+1 -2
View File
@@ -88,8 +88,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
},
loginRequired: function() {
return Discourse.SiteSettings.login_required &&
!Discourse.User.current();
return Discourse.SiteSettings.login_required && !Discourse.User.current();
}.property(),
redirectIfLoginRequired: function(route) {
app/assets/javascripts/discourse/routes/application_routes.js
+6 -6
View File
@@ -7,19 +7,18 @@
Discourse.Route.buildRoutes(function() {
var router = this;
// Generate static page routes
_.each(Discourse.StaticController.PAGES, function (page) {
router.route(page, { path: '/' + page });
});
// Topic routes
this.resource('topic', { path: '/t/:slug/:id' }, function() {
this.route('fromParams', { path: '/' });
this.route('fromParamsNear', { path: '/:nearPost' });
});
// Generate static page routes
_.each(Discourse.StaticController.PAGES, function (page) {
router.route(page, { path: '/' + page });
});
this.resource('discovery', { path: '/' }, function() {
router = this;
// top
@@ -41,6 +40,7 @@ Discourse.Route.buildRoutes(function() {
router.route(top + 'Category', { path: '/category/:parentSlug/:slug/l/top/' + period + '/more' });
});
// filters
Discourse.Site.currentProp('filters').forEach(function(filter) {
router.route(filter, { path: '/' + filter });
router.route(filter, { path: '/' + filter + '/more' });