Mercurial > kallithea

changeset 1916:24aeb43bbf51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes #316
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 19 Jan 2012 07:11:18 +0200
parents 54e84659cb3a
children a7a282a902b2
files docs/changelog.rst rhodecode/model/repo.py
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Thu Jan 19 06:46:25 2012 +0200
+++ b/docs/changelog.rst	Thu Jan 19 07:11:18 2012 +0200
@@ -30,7 +30,7 @@
   a group name. A proper message is now displayed.
 - #292 made ldap_dn in user edit readonly, to get rid of confusion that field
   doesn't work   
-
+- #316 fixes issues with web description in hgrc files 
 
 1.2.3 (**2011-11-02**)
 ======================
--- a/rhodecode/model/repo.py	Thu Jan 19 06:46:25 2012 +0200
+++ b/rhodecode/model/repo.py	Thu Jan 19 07:11:18 2012 +0200
@@ -28,18 +28,15 @@
 import traceback
 from datetime import datetime
 
-from sqlalchemy.orm import joinedload, make_transient
-
 from vcs.utils.lazy import LazyProperty
 from vcs.backends import get_backend
 
-from rhodecode.lib import safe_str
+from rhodecode.lib import safe_str, safe_unicode
 
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import Repository, RepoToPerm, User, Permission, \
     Statistics, UsersGroup, UsersGroupRepoToPerm, RhodeCodeUi, Group
-from rhodecode.model.user import UserModel
 
 log = logging.getLogger(__name__)
 
@@ -236,7 +233,7 @@
                     k = 'group_id'
 
                 if k == 'description':
-                    v = v or repo_name
+                    v = safe_unicode(v) or repo_name
 
                 setattr(new_repo, k, v)