Show More
@@ -505,10 +505,6 b' def make_map(config):' | |||||
505 | m.connect('admin_settings_labs', '/settings/labs', |
|
505 | m.connect('admin_settings_labs', '/settings/labs', | |
506 | action='settings_labs', conditions={'method': ['GET']}) |
|
506 | action='settings_labs', conditions={'method': ['GET']}) | |
507 |
|
507 | |||
508 | m.connect('admin_settings_open_source', '/settings/open_source', |
|
|||
509 | action='settings_open_source', |
|
|||
510 | conditions={'method': ['GET']}) |
|
|||
511 |
|
||||
512 | # ADMIN MY ACCOUNT |
|
508 | # ADMIN MY ACCOUNT | |
513 | with rmap.submapper(path_prefix=ADMIN_PREFIX, |
|
509 | with rmap.submapper(path_prefix=ADMIN_PREFIX, | |
514 | controller='admin/my_account') as m: |
|
510 | controller='admin/my_account') as m: |
@@ -47,7 +47,7 b' from rhodecode.lib.utils2 import (' | |||||
47 | str2bool, safe_unicode, AttributeDict, safe_int) |
|
47 | str2bool, safe_unicode, AttributeDict, safe_int) | |
48 | from rhodecode.lib.compat import OrderedDict |
|
48 | from rhodecode.lib.compat import OrderedDict | |
49 | from rhodecode.lib.ext_json import json |
|
49 | from rhodecode.lib.ext_json import json | |
50 |
from rhodecode.lib.utils import jsonify |
|
50 | from rhodecode.lib.utils import jsonify | |
51 |
|
51 | |||
52 | from rhodecode.model.db import RhodeCodeUi, Repository |
|
52 | from rhodecode.model.db import RhodeCodeUi, Repository | |
53 | from rhodecode.model.forms import ApplicationSettingsForm, \ |
|
53 | from rhodecode.model.forms import ApplicationSettingsForm, \ | |
@@ -61,7 +61,7 b' from rhodecode.model.settings import (' | |||||
61 | IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound, |
|
61 | IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound, | |
62 | SettingsModel) |
|
62 | SettingsModel) | |
63 | from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER |
|
63 | from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER | |
64 | from rhodecode.model.user import UserModel |
|
64 | ||
65 |
|
65 | |||
66 | log = logging.getLogger(__name__) |
|
66 | log = logging.getLogger(__name__) | |
67 |
|
67 | |||
@@ -733,20 +733,6 b' class SettingsController(BaseController)' | |||||
733 | encoding='UTF-8', |
|
733 | encoding='UTF-8', | |
734 | force_defaults=False) |
|
734 | force_defaults=False) | |
735 |
|
735 | |||
736 | @HasPermissionAllDecorator('hg.admin') |
|
|||
737 | def settings_open_source(self): |
|
|||
738 | # url('admin_settings_open_source') |
|
|||
739 |
|
||||
740 | c.active = 'open_source' |
|
|||
741 | c.opensource_licenses = collections.OrderedDict( |
|
|||
742 | sorted(read_opensource_licenses().items(), key=lambda t: t[0])) |
|
|||
743 |
|
||||
744 | return htmlfill.render( |
|
|||
745 | render('admin/settings/settings.html'), |
|
|||
746 | defaults=self._form_defaults(), |
|
|||
747 | encoding='UTF-8', |
|
|||
748 | force_defaults=False) |
|
|||
749 |
|
||||
750 | def _form_defaults(self): |
|
736 | def _form_defaults(self): | |
751 | defaults = SettingsModel().get_all_settings() |
|
737 | defaults = SettingsModel().get_all_settings() | |
752 | defaults.update(self._get_hg_ui_settings()) |
|
738 | defaults.update(self._get_hg_ui_settings()) |
General Comments 0
You need to be logged in to leave comments.
Login now