BUGFIX: JS error when login_required is enabled

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

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) {

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' });

View File

@ -58,16 +58,14 @@ class Site
def self.cached_json(guardian)
if guardian.anonymous? && SiteSetting.login_required
return {}.to_json
return {
periods: TopTopic.periods.map(&:to_s),
filters: Discourse.filters.map(&:to_s),
}.to_json
end
# Sam: bumping this way down, SiteSerializer will serialize post actions as well,
# On my local this was not being flushed as post actions types changed, it turn this
# broke local.
site = Site.new(guardian)
#Discourse.cache.fetch(site.cache_key, family: "site", expires_in: 1.minute) do
MultiJson.dump(SiteSerializer.new(site, root: false))
#end
end
def self.invalidate_cache