|
a/Allura/allura/controllers/static.py |
|
b/Allura/allura/controllers/static.py |
|
... |
|
... |
| 11 |
|
11 |
|
| 12 |
class NewForgeController(object):
|
12 |
class NewForgeController(object):
|
| 13 |
|
13 |
|
| 14 |
@expose()
|
14 |
@expose()
|
| 15 |
@without_trailing_slash
|
15 |
@without_trailing_slash
|
| 16 |
def markdown_to_html(self, markdown, project=None, app=None):
|
16 |
def markdown_to_html(self, markdown, neighborhood=None, project=None, app=None):
|
| 17 |
"""Convert markdown to html."""
|
17 |
"""Convert markdown to html."""
|
| 18 |
if project:
|
18 |
if project:
|
|
|
19 |
if neighborhood:
|
|
|
20 |
n = M.Neighborhood.query.get(name=neighborhood)
|
|
|
21 |
project = M.Project.query.get(shortname=project, neighborhood_id=n._id)
|
| 19 |
g.set_project(project)
|
22 |
g.set_project(project)
|
| 20 |
if app:
|
23 |
if app:
|
| 21 |
g.set_app(app)
|
24 |
g.set_app(app)
|
| 22 |
html = g.markdown.convert(markdown)
|
25 |
html = g.markdown_wiki.convert(markdown)
|
| 23 |
return html
|
26 |
return html
|
| 24 |
|
27 |
|
| 25 |
@expose()
|
28 |
@expose()
|
| 26 |
@with_trailing_slash
|
29 |
@with_trailing_slash
|
| 27 |
def redirect(self, path, **kw):
|
30 |
def redirect(self, path, **kw):
|