diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py --- a/rhodecode/controllers/admin/settings.py +++ b/rhodecode/controllers/admin/settings.py @@ -51,6 +51,7 @@ from rhodecode.model.user import UserMod from rhodecode.model.db import User from rhodecode.model.notification import EmailNotificationModel from rhodecode.model.meta import Session +from rhodecode.lib.utils2 import str2bool log = logging.getLogger(__name__) @@ -471,6 +472,9 @@ class SettingsController(BaseController) if k == '/': k = 'root_path' + if k == 'push_ssl': + v = str2bool(v) + if k.find('.') != -1: k = k.replace('.', '_') @@ -478,5 +482,4 @@ class SettingsController(BaseController) v = each.ui_active settings[each.ui_section + '_' + k] = v - return settings diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -278,6 +278,10 @@ class RhodeCodeUi(Base, BaseModel): Session().add(new_ui) + def __repr__(self): + return '' % (self.__class__.__name__, self.ui_key, + self.ui_value) + class User(Base, BaseModel): __tablename__ = 'users' diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -186,7 +186,7 @@
- ${h.checkbox('web_push_ssl','true')} + ${h.checkbox('web_push_ssl', 'True')}
${_('RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable')}