oss-licenses: Remove pylons view.

This commit is contained in:
Martin Bornhold 2016-06-15 12:06:49 +02:00
parent 24819de588
commit 74d78fdec3
2 changed files with 2 additions and 20 deletions

View file

@ -505,10 +505,6 @@ def make_map(config):
m.connect('admin_settings_labs', '/settings/labs',
action='settings_labs', conditions={'method': ['GET']})
m.connect('admin_settings_open_source', '/settings/open_source',
action='settings_open_source',
conditions={'method': ['GET']})
# ADMIN MY ACCOUNT
with rmap.submapper(path_prefix=ADMIN_PREFIX,
controller='admin/my_account') as m:

View file

@ -47,7 +47,7 @@ from rhodecode.lib.utils2 import (
str2bool, safe_unicode, AttributeDict, safe_int)
from rhodecode.lib.compat import OrderedDict
from rhodecode.lib.ext_json import json
from rhodecode.lib.utils import jsonify, read_opensource_licenses
from rhodecode.lib.utils import jsonify
from rhodecode.model.db import RhodeCodeUi, Repository
from rhodecode.model.forms import ApplicationSettingsForm, \
@ -61,7 +61,7 @@ from rhodecode.model.settings import (
IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound,
SettingsModel)
from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER
from rhodecode.model.user import UserModel
log = logging.getLogger(__name__)
@ -733,20 +733,6 @@ class SettingsController(BaseController):
encoding='UTF-8',
force_defaults=False)
@HasPermissionAllDecorator('hg.admin')
def settings_open_source(self):
# url('admin_settings_open_source')
c.active = 'open_source'
c.opensource_licenses = collections.OrderedDict(
sorted(read_opensource_licenses().items(), key=lambda t: t[0]))
return htmlfill.render(
render('admin/settings/settings.html'),
defaults=self._form_defaults(),
encoding='UTF-8',
force_defaults=False)
def _form_defaults(self):
defaults = SettingsModel().get_all_settings()
defaults.update(self._get_hg_ui_settings())