This is an automated email from the ASF dual-hosted git repository. kentontaylor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit c2bc5be1673ca2b7fee1e438e05fa7abe8054727 Author: Dave Brondsema <[email protected]> AuthorDate: Wed May 19 18:18:31 2021 -0400 [#8388] rename and comments about static vs newforge --- Allura/allura/controllers/{static.py => newforge.py} | 3 +++ Allura/allura/controllers/project.py | 6 +----- Allura/allura/controllers/root.py | 2 +- Allura/allura/tests/functional/test_static.py | 7 ++++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Allura/allura/controllers/static.py b/Allura/allura/controllers/newforge.py similarity index 94% rename from Allura/allura/controllers/static.py rename to Allura/allura/controllers/newforge.py index fa0148b..0060f35 100644 --- a/Allura/allura/controllers/static.py +++ b/Allura/allura/controllers/newforge.py @@ -31,6 +31,9 @@ from allura.lib import utils class NewForgeController(object): + # /nf/_static_/... (or whatever static.script_name is set to) is handled by StaticFilesMiddleware + # /nf/admin/... is handled by SiteAdminController + @expose() @without_trailing_slash def markdown_to_html(self, markdown, neighborhood=None, project=None, app=None): diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py index 0260d7b..9d01eae 100644 --- a/Allura/allura/controllers/project.py +++ b/Allura/allura/controllers/project.py @@ -37,12 +37,10 @@ from ming.utils import LazyProperty from allura import model as M from allura.app import SitemapEntry -from allura.lib.base import WsgiDispatchController from allura.lib import helpers as h from allura.lib.helpers import iter_entry_points from allura.lib import utils from allura.lib.decorators import require_post -from allura.controllers.error import ErrorController from allura.controllers.feed import FeedArgs, FeedController from allura.controllers.rest import nbhd_lookup_first_path from allura.lib.security import require_access @@ -51,9 +49,7 @@ from allura.lib.widgets import forms as ff from allura.lib.widgets import form_fields as ffw from allura.lib.widgets import project_list as plw from allura.lib import plugin, exceptions -from .auth import AuthController -from .search import SearchController, ProjectBrowseController -from .static import NewForgeController +from .search import ProjectBrowseController log = logging.getLogger(__name__) diff --git a/Allura/allura/controllers/root.py b/Allura/allura/controllers/root.py index 885383e..c9092b3 100644 --- a/Allura/allura/controllers/root.py +++ b/Allura/allura/controllers/root.py @@ -41,7 +41,7 @@ from allura.ext.personal_dashboard.dashboard_main import DashboardController from .auth import AuthController from .trovecategories import TroveCategoryController from .search import SearchController, ProjectBrowseController -from .static import NewForgeController +from .newforge import NewForgeController from .site_admin import SiteAdminController from .rest import RestController diff --git a/Allura/allura/tests/functional/test_static.py b/Allura/allura/tests/functional/test_static.py index 0e3eb58..5f54ccc9 100644 --- a/Allura/allura/tests/functional/test_static.py +++ b/Allura/allura/tests/functional/test_static.py @@ -17,10 +17,15 @@ from __future__ import unicode_literals from __future__ import absolute_import + from allura.tests import TestController -class TestStatic(TestController): +class TestStaticFilesMiddleware(TestController): + + # this tests StaticFilesMiddleware + # the URLs are /nf/_static_/... because test.ini has: + # static.script_name = /nf/_static_/ def test_static_controller(self): # package directory
