comparison rhodecode/controllers/admin/settings.py @ 3098:a5f0bc867edc rhodecode-0.0.1.5.0

merge with beta
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 13 Dec 2012 22:54:21 +0100
parents 1f7b8c73c94a 6104dfd35b16
children cd50d1b5f35b
comparison
equal deleted inserted replaced
2909:52b1c6de19c2 3098:a5f0bc867edc
183 183
184 try: 184 try:
185 sett1 = RhodeCodeSetting.get_by_name_or_create('show_public_icon') 185 sett1 = RhodeCodeSetting.get_by_name_or_create('show_public_icon')
186 sett1.app_settings_value = \ 186 sett1.app_settings_value = \
187 form_result['rhodecode_show_public_icon'] 187 form_result['rhodecode_show_public_icon']
188 Session().add(sett1)
188 189
189 sett2 = RhodeCodeSetting.get_by_name_or_create('show_private_icon') 190 sett2 = RhodeCodeSetting.get_by_name_or_create('show_private_icon')
190 sett2.app_settings_value = \ 191 sett2.app_settings_value = \
191 form_result['rhodecode_show_private_icon'] 192 form_result['rhodecode_show_private_icon']
193 Session().add(sett2)
192 194
193 sett3 = RhodeCodeSetting.get_by_name_or_create('stylify_metatags') 195 sett3 = RhodeCodeSetting.get_by_name_or_create('stylify_metatags')
194 sett3.app_settings_value = \ 196 sett3.app_settings_value = \
195 form_result['rhodecode_stylify_metatags'] 197 form_result['rhodecode_stylify_metatags']
196
197 Session().add(sett1)
198 Session().add(sett2)
199 Session().add(sett3) 198 Session().add(sett3)
199
200 sett4 = RhodeCodeSetting.get_by_name_or_create('lightweight_dashboard')
201 sett4.app_settings_value = \
202 form_result['rhodecode_lightweight_dashboard']
203 Session().add(sett4)
204
200 Session().commit() 205 Session().commit()
201 set_rhodecode_config(config) 206 set_rhodecode_config(config)
202 h.flash(_('Updated visualisation settings'), 207 h.flash(_('Updated visualisation settings'),
203 category='success') 208 category='success')
204 209
474 choices, c.landing_revs = ScmModel().get_repo_landing_revs() 479 choices, c.landing_revs = ScmModel().get_repo_landing_revs()
475 480
476 new_repo = request.GET.get('repo', '') 481 new_repo = request.GET.get('repo', '')
477 c.new_repo = repo_name_slug(new_repo) 482 c.new_repo = repo_name_slug(new_repo)
478 483
479 return render('admin/repos/repo_add_create_repository.html') 484 ## apply the defaults from defaults page
485 defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
486 return htmlfill.render(
487 render('admin/repos/repo_add_create_repository.html'),
488 defaults=defaults,
489 errors={},
490 prefix_error=False,
491 encoding="UTF-8"
492 )
480 493
481 def _get_hg_ui_settings(self): 494 def _get_hg_ui_settings(self):
482 ret = RhodeCodeUi.query().all() 495 ret = RhodeCodeUi.query().all()
483 496
484 if not ret: 497 if not ret: