From bbc650bed69d8c68cfab36e8e83219bd057b7263 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 13 Mar 2017 19:03:39 +0100 Subject: [PATCH] svn-support: move into apps module. --- rhodecode/apps/admin/views/svn_config.py | 2 +- rhodecode/{ => apps}/svn_support/__init__.py | 0 rhodecode/{ => apps}/svn_support/config_keys.py | 0 rhodecode/{ => apps}/svn_support/events.py | 0 rhodecode/{ => apps}/svn_support/subscribers.py | 0 .../{ => apps}/svn_support/templates/mod-dav-svn.conf.mako | 0 .../{ => apps}/svn_support/tests/test_mod_dav_svn_config.py | 2 +- rhodecode/{ => apps}/svn_support/utils.py | 2 +- rhodecode/config/middleware.py | 2 +- rhodecode/controllers/admin/settings.py | 2 +- 10 files changed, 5 insertions(+), 5 deletions(-) rename rhodecode/{ => apps}/svn_support/__init__.py (100%) rename rhodecode/{ => apps}/svn_support/config_keys.py (100%) rename rhodecode/{ => apps}/svn_support/events.py (100%) rename rhodecode/{ => apps}/svn_support/subscribers.py (100%) rename rhodecode/{ => apps}/svn_support/templates/mod-dav-svn.conf.mako (100%) rename rhodecode/{ => apps}/svn_support/tests/test_mod_dav_svn_config.py (98%) rename rhodecode/{ => apps}/svn_support/utils.py (97%) diff --git a/rhodecode/apps/admin/views/svn_config.py b/rhodecode/apps/admin/views/svn_config.py index 31d54700..a0c5ad7e 100644 --- a/rhodecode/apps/admin/views/svn_config.py +++ b/rhodecode/apps/admin/views/svn_config.py @@ -23,7 +23,7 @@ import logging from pyramid.view import view_config from rhodecode.apps._base import BaseAppView -from rhodecode.svn_support.utils import generate_mod_dav_svn_config +from rhodecode.apps.svn_support.utils import generate_mod_dav_svn_config from rhodecode.lib.auth import ( LoginRequired, HasPermissionAllDecorator, CSRFRequired) diff --git a/rhodecode/svn_support/__init__.py b/rhodecode/apps/svn_support/__init__.py similarity index 100% rename from rhodecode/svn_support/__init__.py rename to rhodecode/apps/svn_support/__init__.py diff --git a/rhodecode/svn_support/config_keys.py b/rhodecode/apps/svn_support/config_keys.py similarity index 100% rename from rhodecode/svn_support/config_keys.py rename to rhodecode/apps/svn_support/config_keys.py diff --git a/rhodecode/svn_support/events.py b/rhodecode/apps/svn_support/events.py similarity index 100% rename from rhodecode/svn_support/events.py rename to rhodecode/apps/svn_support/events.py diff --git a/rhodecode/svn_support/subscribers.py b/rhodecode/apps/svn_support/subscribers.py similarity index 100% rename from rhodecode/svn_support/subscribers.py rename to rhodecode/apps/svn_support/subscribers.py diff --git a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako b/rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako similarity index 100% rename from rhodecode/svn_support/templates/mod-dav-svn.conf.mako rename to rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako diff --git a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py similarity index 98% rename from rhodecode/svn_support/tests/test_mod_dav_svn_config.py rename to rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py index d0e80483..9705fba3 100644 --- a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py +++ b/rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py @@ -25,7 +25,7 @@ import re from pyramid import testing -from rhodecode.svn_support import utils +from rhodecode.apps.svn_support import utils class TestModDavSvnConfig(object): diff --git a/rhodecode/svn_support/utils.py b/rhodecode/apps/svn_support/utils.py similarity index 97% rename from rhodecode/svn_support/utils.py rename to rhodecode/apps/svn_support/utils.py index b10dd4e1..7cd9d11c 100644 --- a/rhodecode/svn_support/utils.py +++ b/rhodecode/apps/svn_support/utils.py @@ -81,7 +81,7 @@ def _render_mod_dav_svn_config( } # Render the configuration template to string. - template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako' + template = 'rhodecode:apps/svn_support/templates/mod-dav-svn.conf.mako' return render(template, context) diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index 4f7fd033..cff6bb6d 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -287,10 +287,10 @@ def includeme(config): config.include('rhodecode.apps.login') config.include('rhodecode.apps.user_profile') config.include('rhodecode.apps.my_account') + config.include('rhodecode.apps.svn_support') config.include('rhodecode.tweens') config.include('rhodecode.api') - config.include('rhodecode.svn_support') config.add_route( 'rhodecode_support', 'https://rhodecode.com/help/', static=True) diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py index b79c8248..b71262d5 100644 --- a/rhodecode/controllers/admin/settings.py +++ b/rhodecode/controllers/admin/settings.py @@ -37,6 +37,7 @@ from webob.exc import HTTPBadRequest import rhodecode from rhodecode.apps.admin.navigation import navigation_list +from rhodecode.apps.svn_support.config_keys import generate_config from rhodecode.lib import auth from rhodecode.lib import helpers as h from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator @@ -62,7 +63,6 @@ from rhodecode.model.settings import ( SettingsModel) from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER -from rhodecode.svn_support.config_keys import generate_config log = logging.getLogger(__name__)