changeset 1561:4d841e565237 beta

added validation of params on settings table
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 17 Oct 2011 00:18:12 +0200
parents a682eda60840
children f8321ccf6529
files rhodecode/controllers/admin/repos.py rhodecode/model/db.py
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py	Thu Oct 13 04:36:08 2011 +0200
+++ b/rhodecode/controllers/admin/repos.py	Mon Oct 17 00:18:12 2011 +0200
@@ -80,7 +80,7 @@
         self.__load_defaults()
 
         c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)
-        repo = scm_repo = db_repo.scm_instance
+        repo = db_repo.scm_instance
 
         if c.repo_info is None:
             h.flash(_('%s repository is not mapped to db perhaps'
--- a/rhodecode/model/db.py	Thu Oct 13 04:36:08 2011 +0200
+++ b/rhodecode/model/db.py	Mon Oct 17 00:18:12 2011 +0200
@@ -32,9 +32,9 @@
 from sqlalchemy import *
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm import relationship, backref, joinedload, class_mapper
+from sqlalchemy.orm import relationship, backref, joinedload, class_mapper, \
+    validates
 from sqlalchemy.orm.interfaces import MapperExtension
-
 from beaker.cache import cache_region, region_invalidate
 
 from vcs import get_backend
@@ -150,6 +150,11 @@
         self.app_settings_value = v
 
 
+    @validates('_app_settings_value')
+    def validate_settings_value(self, key, val):
+        assert type(val) == unicode
+        return val
+
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value