diff 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
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py	Tue Oct 09 00:57:07 2012 +0200
+++ b/rhodecode/controllers/admin/settings.py	Thu Dec 13 22:54:21 2012 +0100
@@ -185,18 +185,23 @@
                 sett1 = RhodeCodeSetting.get_by_name_or_create('show_public_icon')
                 sett1.app_settings_value = \
                     form_result['rhodecode_show_public_icon']
+                Session().add(sett1)
 
                 sett2 = RhodeCodeSetting.get_by_name_or_create('show_private_icon')
                 sett2.app_settings_value = \
                     form_result['rhodecode_show_private_icon']
+                Session().add(sett2)
 
                 sett3 = RhodeCodeSetting.get_by_name_or_create('stylify_metatags')
                 sett3.app_settings_value = \
                     form_result['rhodecode_stylify_metatags']
+                Session().add(sett3)
 
-                Session().add(sett1)
-                Session().add(sett2)
-                Session().add(sett3)
+                sett4 = RhodeCodeSetting.get_by_name_or_create('lightweight_dashboard')
+                sett4.app_settings_value = \
+                    form_result['rhodecode_lightweight_dashboard']
+                Session().add(sett4)
+
                 Session().commit()
                 set_rhodecode_config(config)
                 h.flash(_('Updated visualisation settings'),
@@ -476,7 +481,15 @@
         new_repo = request.GET.get('repo', '')
         c.new_repo = repo_name_slug(new_repo)
 
-        return render('admin/repos/repo_add_create_repository.html')
+        ## apply the defaults from defaults page
+        defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
+        return htmlfill.render(
+            render('admin/repos/repo_add_create_repository.html'),
+            defaults=defaults,
+            errors={},
+            prefix_error=False,
+            encoding="UTF-8"
+        )
 
     def _get_hg_ui_settings(self):
         ret = RhodeCodeUi.query().all()