##// END OF EJS Templates
fixed issue #560 require push ssl checkbox wasn't shown when option was enabled
marcink -
r2821:9c90be87 beta
parent child Browse files
Show More
@@ -51,6 +51,7 b' from rhodecode.model.user import UserMod'
51 51 from rhodecode.model.db import User
52 52 from rhodecode.model.notification import EmailNotificationModel
53 53 from rhodecode.model.meta import Session
54 from rhodecode.lib.utils2 import str2bool
54 55
55 56 log = logging.getLogger(__name__)
56 57
@@ -471,6 +472,9 b' class SettingsController(BaseController)'
471 472 if k == '/':
472 473 k = 'root_path'
473 474
475 if k == 'push_ssl':
476 v = str2bool(v)
477
474 478 if k.find('.') != -1:
475 479 k = k.replace('.', '_')
476 480
@@ -478,5 +482,4 b' class SettingsController(BaseController)'
478 482 v = each.ui_active
479 483
480 484 settings[each.ui_section + '_' + k] = v
481
482 485 return settings
@@ -278,6 +278,10 b' class RhodeCodeUi(Base, BaseModel):'
278 278
279 279 Session().add(new_ui)
280 280
281 def __repr__(self):
282 return '<DB:%s[%s:%s]>' % (self.__class__.__name__, self.ui_key,
283 self.ui_value)
284
281 285
282 286 class User(Base, BaseModel):
283 287 __tablename__ = 'users'
@@ -186,7 +186,7 b''
186 186 </div>
187 187 <div class="checkboxes">
188 188 <div class="checkbox">
189 ${h.checkbox('web_push_ssl','true')}
189 ${h.checkbox('web_push_ssl', 'True')}
190 190 <label for="web_push_ssl">${_('require ssl for vcs operations')}</label>
191 191 </div>
192 192 <span class="help-block">${_('RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable')}</span>
General Comments 0
You need to be logged in to leave comments. Login now