Merge remote-tracking branch 'refs/remotes/tilly-q/variable-front-page'
This commit is contained in:
commit
cb76655ce2
@ -17,13 +17,14 @@
|
|||||||
from mediagoblin import mg_globals
|
from mediagoblin import mg_globals
|
||||||
from mediagoblin.db.models import MediaEntry
|
from mediagoblin.db.models import MediaEntry
|
||||||
from mediagoblin.tools.pagination import Pagination
|
from mediagoblin.tools.pagination import Pagination
|
||||||
|
from mediagoblin.tools.pluginapi import hook_handle
|
||||||
from mediagoblin.tools.response import render_to_response, render_404
|
from mediagoblin.tools.response import render_to_response, render_404
|
||||||
from mediagoblin.decorators import uses_pagination, user_not_banned
|
from mediagoblin.decorators import uses_pagination, user_not_banned
|
||||||
|
|
||||||
|
|
||||||
@user_not_banned
|
@user_not_banned
|
||||||
@uses_pagination
|
@uses_pagination
|
||||||
def root_view(request, page):
|
def default_root_view(request, page):
|
||||||
cursor = MediaEntry.query.filter_by(state=u'processed').\
|
cursor = MediaEntry.query.filter_by(state=u'processed').\
|
||||||
order_by(MediaEntry.created.desc())
|
order_by(MediaEntry.created.desc())
|
||||||
|
|
||||||
@ -51,3 +52,5 @@ def terms_of_service(request):
|
|||||||
|
|
||||||
return render_to_response(request,
|
return render_to_response(request,
|
||||||
'mediagoblin/terms_of_service.html', {})
|
'mediagoblin/terms_of_service.html', {})
|
||||||
|
|
||||||
|
root_view = hook_handle("frontpage_view") or default_root_view
|
||||||
|
Loading…
x
Reference in New Issue
Block a user