admin-defaults: ported views to pyramid.

rhodecode/apps/admin/views/defaults.py

@@ -0,0 +1,111 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+import formencode
+import formencode.htmlfill
+
+from pyramid.view import view_config
+from pyramid.httpexceptions import HTTPFound
+from pyramid.renderers import render
+from pyramid.response import Response
+
+from rhodecode.apps._base import BaseAppView
+from rhodecode.lib.auth import (
+    LoginRequired, HasPermissionAllDecorator, CSRFRequired)
+from rhodecode.lib import helpers as h
+from rhodecode.model.forms import DefaultsForm
+from rhodecode.model.meta import Session
+from rhodecode import BACKENDS
+from rhodecode.model.settings import SettingsModel
+
+log = logging.getLogger(__name__)
+
+
+class AdminDefaultSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_defaults_repositories', request_method='GET',
+        renderer='rhodecode:templates/admin/defaults/defaults.mako')
+    def defaults_repository_show(self):
+        c = self.load_default_context()
+        c.backends = BACKENDS.keys()
+        c.active = 'repositories'
+        defaults = SettingsModel().get_default_repo_settings()
+
+        data = render(
+            'rhodecode:templates/admin/defaults/defaults.mako',
+            self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=defaults,
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_defaults_repositories_update', request_method='POST',
+        renderer='rhodecode:templates/admin/defaults/defaults.mako')
+    def defaults_repository_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'repositories'
+        form = DefaultsForm()()
+
+        try:
+            form_result = form.to_python(dict(self.request.POST))
+            for k, v in form_result.iteritems():
+                setting = SettingsModel().create_or_update_setting(k, v)
+                Session().add(setting)
+            Session().commit()
+            h.flash(_('Default settings updated successfully'),
+                    category='success')
+
+        except formencode.Invalid as errors:
+            data = render(
+                'rhodecode:templates/admin/defaults/defaults.mako',
+                self._get_template_context(c), self.request)
+            html = formencode.htmlfill.render(
+                data,
+                defaults=errors.value,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8",
+                force_defaults=False
+            )
+            return Response(html)
+        except Exception:
+            log.exception('Exception in update action')
+            h.flash(_('Error occurred during update of default values'),
+                    category='error')
+
+        raise HTTPFound(h.route_path('admin_defaults_repositories'))

rhodecode/apps/admin/__init__.py

@@ -71,6 +71,14 b' def admin_routes(config):'
         name='admin_settings_process_management_signal',
         pattern='/settings/process_management/signal')
 
+    # default settings
+    config.add_route(
+        name='admin_defaults_repositories',
+        pattern='/defaults/repositories')
+    config.add_route(
+        name='admin_defaults_repositories_update',
+        pattern='/defaults/repositories/update')
+
     # global permissions
 
     config.add_route(

rhodecode/apps/admin/tests/test_admin_defaults.py

@@ -20,15 +20,31 b''
 
 import pytest
 
-from rhodecode.tests import assert_session_flash, url
+from rhodecode.tests import assert_session_flash
 from rhodecode.model.settings import SettingsModel
 
 
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+        'admin_defaults_repositories':
+            ADMIN_PREFIX + '/defaults/repositories',
+        'admin_defaults_repositories_update':
+            ADMIN_PREFIX + '/defaults/repositories/update',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
 @pytest.mark.usefixtures("app")
-class TestDefaultsController:
+class TestDefaultsController(object):
 
     def test_index(self, autologin_user):
-        response = self.app.get(url('admin_defaults_repositories'))
+        response = self.app.get(route_path('admin_defaults_repositories'))
         response.mustcontain('default_repo_private')
         response.mustcontain('default_repo_enable_statistics')
         response.mustcontain('default_repo_enable_downloads')
@@ -44,7 +60,7 b' class TestDefaultsController:'
             'csrf_token': csrf_token,
         }
         response = self.app.post(
-            url('admin_defaults_repositories'), params=params)
+            route_path('admin_defaults_repositories_update'), params=params)
         assert_session_flash(response, 'Default settings updated successfully')
 
         defs = SettingsModel().get_default_repo_settings()
@@ -61,8 +77,9 b' class TestDefaultsController:'
             'csrf_token': csrf_token,
         }
         response = self.app.post(
-            url('admin_defaults_repositories'), params=params)
+            route_path('admin_defaults_repositories_update'), params=params)
         assert_session_flash(response, 'Default settings updated successfully')
+
         defs = SettingsModel().get_default_repo_settings()
         del params['csrf_token']
         assert params == defs

rhodecode/config/routing.py

@@ -254,14 +254,6 b' def make_map(config):'
         m.connect('edit_user_global_perms', '/users/{user_id}/edit/global_permissions',
                   action='update_global_perms', conditions={'method': ['PUT']})
 
-    # ADMIN DEFAULTS REST ROUTES
-    with rmap.submapper(path_prefix=ADMIN_PREFIX,
-                        controller='admin/defaults') as m:
-        m.connect('admin_defaults_repositories', '/defaults/repositories',
-                  action='update_repository_defaults', conditions={'method': ['POST']})
-        m.connect('admin_defaults_repositories', '/defaults/repositories',
-                  action='index', conditions={'method': ['GET']})
-
     # ADMIN SETTINGS ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/settings') as m:

rhodecode/public/js/rhodecode/routes.js

@@ -47,6 +47,8 b' function registerRCRoutes() {'
     pyroutes.register('admin_settings_sessions_cleanup', '/_admin/settings/sessions/cleanup', []);
     pyroutes.register('admin_settings_process_management', '/_admin/settings/process_management', []);
     pyroutes.register('admin_settings_process_management_signal', '/_admin/settings/process_management/signal', []);
+    pyroutes.register('admin_defaults_repositories', '/_admin/defaults/repositories', []);
+    pyroutes.register('admin_defaults_repositories_update', '/_admin/defaults/repositories/update', []);
     pyroutes.register('admin_permissions_application', '/_admin/permissions/application', []);
     pyroutes.register('admin_permissions_application_update', '/_admin/permissions/application/update', []);
     pyroutes.register('admin_permissions_global', '/_admin/permissions/global', []);

rhodecode/templates/admin/defaults/defaults.mako

@@ -28,7 +28,7 b''
     <div class="sidebar-col-wrapper">
         <div class="sidebar">
             <ul class="nav nav-pills nav-stacked">
-              <li class="${'active' if c.active=='repositories' else ''}"><a href="${h.url('admin_defaults_repositories')}">${_('Repository')}</a></li>
+              <li class="${'active' if c.active=='repositories' else ''}"><a href="${h.route_path('admin_defaults_repositories')}">${_('Repository')}</a></li>
             </ul>
         </div>
 

rhodecode/templates/admin/defaults/defaults_repositories.mako

@@ -3,7 +3,7 b''
         <h3 class="panel-title">${_('Default Settings For New Repositories')}</h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(h.url('admin_defaults_repositories'), method='post')}
+        ${h.secure_form(h.route_path('admin_defaults_repositories_update'), method='POST', request=request)}
         <div class="form">
             <!-- fields -->
 

rhodecode/templates/base/base.mako

@@ -80,7 +80,7 b''
       <li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
       <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
       <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
-      <li><a href="${h.url('admin_defaults_repositories')}">${_('Defaults')}</a></li>
+      <li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}">${_('Settings')}</a></li>
   </ul>
 </%def>