kallithea Changeset - 5585609772d0

Changeset - 5585609772d0

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Marcin Kuzminski - 14 years ago 2011-10-07 17:54:21
marcin@python-works.com

merge beta fixes into stable

2 files changed with 6 insertions and 2 deletions:

rhodecode/model/repo.py

rhodecode/model/user.py

0 comments (0 inline, 0 general)

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -192,6 +192,9 @@ class RepoModel(BaseModel): @@
                 if k == 'repo_group':
                     k = 'group_id'
                 if k == 'description':
                     v = v or repo_name
                 setattr(new_repo, k, v)
             if fork:
@@ @@ -302,7 +305,7 @@ class RepoModel(BaseModel): @@
         :param clone_uri:
         """
         from rhodecode.lib.utils import is_valid_repo
         if new_parent_id:
             paths = Group.get(new_parent_id).full_path.split(Group.url_sep())
             new_parent_path = os.sep.join(paths)

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -28,6 +28,7 @@ import traceback @@
 from pylons.i18n.translation import _
 from rhodecode.lib import safe_unicode
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \
@@ @@ -111,7 +112,7 @@ class UserModel(BaseModel): @@
                 new_user.api_key = generate_api_key(username)
                 new_user.email = attrs['email']
                 new_user.active = True
                 new_user.ldap_dn = user_dn
+                new_user.ldap_dn = safe_unicode(user_dn)
                 new_user.name = attrs['name']
                 new_user.lastname = attrs['lastname']

0 comments (0 inline, 0 general)