fix flatpagesroot
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
from flask import Flask, Blueprint,render_template, send_from_directory,jsonify, url_for
|
||||
from flatpages_index import FlatPagesIndex
|
||||
import flatpages_index
|
||||
|
||||
import os
|
||||
def create_bp(app):
|
||||
|
||||
flatpages = FlatPagesIndex(app)
|
||||
@@ -32,8 +32,8 @@ def create_bp(app):
|
||||
return render_template(page["template"], post=page,
|
||||
pth=page["dirpath"])
|
||||
|
||||
if os.path.exists(os.path.join(FLATPAGES_ROOT,name)):
|
||||
return send_from_directory(FLATPAGES_ROOT,name)
|
||||
if os.path.exists(os.path.join(app.config['FLATPAGES_ROOT'],name)):
|
||||
return send_from_directory(app.config['FLATPAGES_ROOT'],name)
|
||||
else:
|
||||
return send_from_directory('static',name)
|
||||
|
||||
@@ -49,8 +49,8 @@ def create_bp(app):
|
||||
# page.links.file_url=lambda n: url_for('intern.post', name=n)
|
||||
return jsonify(page=dict(page))
|
||||
|
||||
if os.path.exists(u'{}/{}'.format(FLATPAGES_ROOT,path)):
|
||||
return send_from_directory(FLATPAGES_ROOT,path)
|
||||
if os.path.exists(u'{}/{}'.format(app.config['FLATPAGES_ROOT'],path)):
|
||||
return send_from_directory(app.config['FLATPAGES_ROOT'],path)
|
||||
else:
|
||||
return send_from_directory('static',path)
|
||||
return page_blueprint
|
||||
@@ -29,4 +29,8 @@ def test_links_in_index(index_html):
|
||||
assert 'href="/topic1/"' in index_html
|
||||
|
||||
def test_text_in_index(index_html):
|
||||
assert 'asdfasdfasdf' in index_html
|
||||
assert 'asdfasdfasdf' in index_html
|
||||
|
||||
def test_jpg(client):
|
||||
resp = client.get('/topic1/test.jpg/')
|
||||
assert resp.status_code == 200
|
||||
|
||||
Reference in New Issue
Block a user