Mercurial > kallithea
changeset 1594:9dae92a65e40 beta
fixes #288
- added group management into non admin repo settings form
- fixes also issues with groups after API codes merge
- all tests passes ok.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 24 Oct 2011 22:40:43 +0200 |
| parents | 92a4f7c496a5 |
| children | 7cd8fd4d1e38 |
| files | rhodecode/controllers/admin/repos.py rhodecode/controllers/api/api.py rhodecode/controllers/settings.py rhodecode/model/db.py rhodecode/model/forms.py rhodecode/model/repo.py rhodecode/model/repos_group.py rhodecode/model/user.py rhodecode/templates/settings/repo_settings.html rhodecode/tests/__init__.py |
| diffstat | 10 files changed, 356 insertions(+), 343 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/controllers/admin/repos.py Mon Oct 24 22:40:43 2011 +0200 @@ -26,7 +26,6 @@ import logging import traceback import formencode -from operator import itemgetter from formencode import htmlfill from paste.httpexceptions import HTTPInternalServerError @@ -92,7 +91,7 @@ return redirect(url('repos')) c.default_user_id = User.get_by_username('default').user_id - c.in_public_journal = self.sa.query(UserFollowing)\ + c.in_public_journal = UserFollowing.query()\ .filter(UserFollowing.user_id == c.default_user_id)\ .filter(UserFollowing.follows_repository == c.repo_info).scalar() @@ -110,30 +109,7 @@ c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100) - defaults = c.repo_info.get_dict() - group, repo_name = c.repo_info.groups_and_repo - defaults['repo_name'] = repo_name - defaults['repo_group'] = getattr(group[-1] if group else None, - 'group_id', None) - - #fill owner - if c.repo_info.user: - defaults.update({'user': c.repo_info.user.username}) - else: - replacement_user = self.sa.query(User)\ - .filter(User.admin == True).first().username - defaults.update({'user': replacement_user}) - - #fill repository users - for p in c.repo_info.repo_to_perm: - defaults.update({'u_perm_%s' % p.user.username: - p.permission.permission_name}) - - #fill repository groups - for p in c.repo_info.users_group_to_perm: - defaults.update({'g_perm_%s' % p.users_group.users_group_name: - p.permission.permission_name}) - + defaults = RepoModel()._get_defaults(repo_name) return defaults @HasPermissionAllDecorator('hg.admin')
--- a/rhodecode/controllers/api/api.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/controllers/api/api.py Mon Oct 24 22:40:43 2011 +0200 @@ -2,7 +2,8 @@ import logging from rhodecode.controllers.api import JSONRPCController, JSONRPCError -from rhodecode.lib.auth import HasPermissionAllDecorator, HasPermissionAnyDecorator +from rhodecode.lib.auth import HasPermissionAllDecorator, \ + HasPermissionAnyDecorator from rhodecode.model.scm import ScmModel from rhodecode.model.db import User, UsersGroup, Group, Repository @@ -65,14 +66,14 @@ if not user: return None - return dict(id = user.user_id, - username = user.username, - firstname = user.name, - lastname = user.lastname, - email = user.email, - active = user.active, - admin = user.admin, - ldap = user.ldap_dn) + return dict(id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap=user.ldap_dn) @HasPermissionAllDecorator('hg.admin') def get_users(self, apiuser): @@ -84,19 +85,19 @@ result = [] for user in User.getAll(): - result.append(dict(id = user.user_id, - username = user.username, - firstname = user.name, - lastname = user.lastname, - email = user.email, - active = user.active, - admin = user.admin, - ldap = user.ldap_dn)) + result.append(dict(id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap=user.ldap_dn)) return result @HasPermissionAllDecorator('hg.admin') def create_user(self, apiuser, username, password, firstname, - lastname, email, active = True, admin = False, ldap_dn = None): + lastname, email, active=True, admin=False, ldap_dn=None): """ Create new user @@ -115,16 +116,16 @@ raise JSONRPCError("user %s already exist" % username) try: - form_data = dict(username = username, - password = password, - active = active, - admin = admin, - name = firstname, - lastname = lastname, - email = email, - ldap_dn = ldap_dn) + form_data = dict(username=username, + password=password, + active=active, + admin=admin, + name=firstname, + lastname=lastname, + email=email, + ldap_dn=ldap_dn) UserModel().create_ldap(username, password, ldap_dn, form_data) - return dict(msg = 'created new user %s' % username) + return dict(msg='created new user %s' % username) except Exception: log.error(traceback.format_exc()) raise JSONRPCError('failed to create user %s' % username) @@ -145,19 +146,19 @@ members = [] for user in users_group.members: user = user.user - members.append(dict(id = user.user_id, - username = user.username, - firstname = user.name, - lastname = user.lastname, - email = user.email, - active = user.active, - admin = user.admin, - ldap = user.ldap_dn)) + members.append(dict(id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap=user.ldap_dn)) - return dict(id = users_group.users_group_id, - name = users_group.users_group_name, - active = users_group.users_group_active, - members = members) + return dict(id=users_group.users_group_id, + name=users_group.users_group_name, + active=users_group.users_group_active, + members=members) @HasPermissionAllDecorator('hg.admin') def get_users_groups(self, apiuser): @@ -172,23 +173,23 @@ members = [] for user in users_group.members: user = user.user - members.append(dict(id = user.user_id, - username = user.username, - firstname = user.name, - lastname = user.lastname, - email = user.email, - active = user.active, - admin = user.admin, - ldap = user.ldap_dn)) + members.append(dict(id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap=user.ldap_dn)) - result.append(dict(id = users_group.users_group_id, - name = users_group.users_group_name, - active = users_group.users_group_active, - members = members)) + result.append(dict(id=users_group.users_group_id, + name=users_group.users_group_name, + active=users_group.users_group_active, + members=members)) return result @HasPermissionAllDecorator('hg.admin') - def create_users_group(self, apiuser, name, active = True): + def create_users_group(self, apiuser, name, active=True): """ Creates an new usergroup @@ -200,11 +201,11 @@ raise JSONRPCError("users group %s already exist" % name) try: - form_data = dict(users_group_name = name, - users_group_active = active) + form_data = dict(users_group_name=name, + users_group_active=active) ug = UsersGroup.create(form_data) - return dict(id = ug.users_group_id, - msg = 'created new users group %s' % name) + return dict(id=ug.users_group_id, + msg='created new users group %s' % name) except Exception: log.error(traceback.format_exc()) raise JSONRPCError('failed to create group %s' % name) @@ -231,8 +232,8 @@ ugm = UsersGroupModel().add_user_to_group(users_group, user) - return dict(id = ugm.users_group_member_id, - msg = 'created new users group member') + return dict(id=ugm.users_group_member_id, + msg='created new users group member') except Exception: log.error(traceback.format_exc()) raise JSONRPCError('failed to create users group member') @@ -255,30 +256,30 @@ for user in repo.repo_to_perm: perm = user.permission.permission_name user = user.user - members.append(dict(type_ = "user", - id = user.user_id, - username = user.username, - firstname = user.name, - lastname = user.lastname, - email = user.email, - active = user.active, - admin = user.admin, - ldap = user.ldap_dn, - permission = perm)) + members.append(dict(type_="user", + id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap=user.ldap_dn, + permission=perm)) for users_group in repo.users_group_to_perm: perm = users_group.permission.permission_name users_group = users_group.users_group - members.append(dict(type_ = "users_group", - id = users_group.users_group_id, - name = users_group.users_group_name, - active = users_group.users_group_active, - permission = perm)) + members.append(dict(type_="users_group", + id=users_group.users_group_id, + name=users_group.users_group_name, + active=users_group.users_group_active, + permission=perm)) - return dict(id = repo.repo_id, - name = repo.repo_name, - type = repo.repo_type, - description = repo.description, - members = members) + return dict(id=repo.repo_id, + name=repo.repo_name, + type=repo.repo_type, + description=repo.description, + members=members) @HasPermissionAnyDecorator('hg.admin') def get_repos(self, apiuser): @@ -290,15 +291,15 @@ result = [] for repository in Repository.getAll(): - result.append(dict(id = repository.repo_id, - name = repository.repo_name, - type = repository.repo_type, - description = repository.description)) + result.append(dict(id=repository.repo_id, + name=repository.repo_name, + type=repository.repo_type, + description=repository.description)) return result @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository') - def create_repo(self, apiuser, name, owner_name, description = '', repo_type = 'hg', \ - private = False): + def create_repo(self, apiuser, name, owner_name, description='', + repo_type='hg', private=False): """ Create a repository @@ -326,18 +327,18 @@ for g in groups: group = Group.get_by_group_name(g) if not group: - group = ReposGroupModel().create(dict(group_name = g, - group_description = '', - group_parent_id = parent_id)) + group = ReposGroupModel().create(dict(group_name=g, + group_description='', + group_parent_id=parent_id)) parent_id = group.group_id - RepoModel().create(dict(repo_name = real_name, - repo_name_full = name, - description = description, - private = private, - repo_type = repo_type, - repo_group = parent_id, - clone_uri = None), owner) + RepoModel().create(dict(repo_name=real_name, + repo_name_full=name, + description=description, + private=private, + repo_type=repo_type, + repo_group=parent_id, + clone_uri=None), owner) except Exception: log.error(traceback.format_exc()) raise JSONRPCError('failed to create repository %s' % name) @@ -364,9 +365,10 @@ except NoResultFound: raise JSONRPCError('unknown user %s' % user) - RepositoryPermissionModel().update_or_delete_user_permission(repo, user, perm) + RepositoryPermissionModel()\ + .update_or_delete_user_permission(repo, user, perm) except Exception: log.error(traceback.format_exc()) raise JSONRPCError('failed to edit permission %(repo)s for %(user)s' - % dict(user = user_name, repo = repo_name)) + % dict(user=user_name, repo=repo_name))
--- a/rhodecode/controllers/settings.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/controllers/settings.py Mon Oct 24 22:40:43 2011 +0200 @@ -42,7 +42,7 @@ from rhodecode.model.forms import RepoSettingsForm, RepoForkForm from rhodecode.model.repo import RepoModel -from rhodecode.model.db import User +from rhodecode.model.db import Group log = logging.getLogger(__name__) @@ -52,7 +52,15 @@ @LoginRequired() def __before__(self): super(SettingsController, self).__before__() - + + def __load_defaults(self): + c.repo_groups = Group.groups_choices() + c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups) + + repo_model = RepoModel() + c.users_array = repo_model.get_users_js() + c.users_groups_array = repo_model.get_users_groups_js() + @HasRepoPermissionAllDecorator('repository.admin') def index(self, repo_name): repo_model = RepoModel() @@ -66,28 +74,9 @@ return redirect(url('home')) - c.users_array = repo_model.get_users_js() - c.users_groups_array = repo_model.get_users_groups_js() - - defaults = c.repo_info.get_dict() + self.__load_defaults() - #fill owner - if c.repo_info.user: - defaults.update({'user': c.repo_info.user.username}) - else: - replacement_user = self.sa.query(User)\ - .filter(User.admin == True).first().username - defaults.update({'user': replacement_user}) - - #fill repository users - for p in c.repo_info.repo_to_perm: - defaults.update({'u_perm_%s' % p.user.username: - p.permission.permission_name}) - - #fill repository groups - for p in c.repo_info.users_group_to_perm: - defaults.update({'g_perm_%s' % p.users_group.users_group_name: - p.permission.permission_name}) + defaults = RepoModel()._get_defaults(repo_name) return htmlfill.render( render('settings/repo_settings.html'), @@ -100,17 +89,22 @@ def update(self, repo_name): repo_model = RepoModel() changed_name = repo_name + + self.__load_defaults() + _form = RepoSettingsForm(edit=True, - old_data={'repo_name': repo_name})() + old_data={'repo_name': repo_name}, + repo_groups=c.repo_groups_choices)() try: form_result = _form.to_python(dict(request.POST)) + repo_model.update(repo_name, form_result) invalidate_cache('get_repo_cached_%s' % repo_name) h.flash(_('Repository %s updated successfully' % repo_name), category='success') - changed_name = form_result['repo_name'] + changed_name = form_result['repo_name_full'] action_logger(self.rhodecode_user, 'user_updated_repo', - changed_name, '', self.sa) + changed_name, '', self.sa) except formencode.Invalid, errors: c.repo_info = repo_model.get_by_repo_name(repo_name) c.users_array = repo_model.get_users_js()
--- a/rhodecode/model/db.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/model/db.py Mon Oct 24 22:40:43 2011 +0200 @@ -30,11 +30,8 @@ from datetime import date from sqlalchemy import * -from sqlalchemy.exc import DatabaseError from sqlalchemy.ext.hybrid import hybrid_property -from sqlalchemy.orm import relationship, backref, joinedload, class_mapper, \ - validates -from sqlalchemy.orm.interfaces import MapperExtension +from sqlalchemy.orm import relationship, joinedload, class_mapper, validates from beaker.cache import cache_region, region_invalidate from vcs import get_backend @@ -128,7 +125,8 @@ @classmethod def get(cls, id_): - return cls.query().get(id_) + if id_: + return cls.query().get(id_) @classmethod def getAll(cls): @@ -144,11 +142,11 @@ class RhodeCodeSettings(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing':True}) - app_settings_id = Column("app_settings_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - app_settings_name = Column("app_settings_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - _app_settings_value = Column("app_settings_value", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) + app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + app_settings_name = Column("app_settings_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + _app_settings_value = Column("app_settings_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - def __init__(self, k = '', v = ''): + def __init__(self, k='', v=''): self.app_settings_name = k self.app_settings_value = v @@ -185,7 +183,7 @@ .filter(cls.app_settings_name == ldap_key).scalar() @classmethod - def get_app_settings(cls, cache = False): + def get_app_settings(cls, cache=False): ret = cls.query() @@ -202,7 +200,7 @@ return settings @classmethod - def get_ldap_settings(cls, cache = False): + def get_ldap_settings(cls, cache=False): ret = cls.query()\ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} @@ -221,11 +219,11 @@ HOOK_PUSH = 'pretxnchangegroup.push_logger' HOOK_PULL = 'preoutgoing.pull_logger' - ui_id = Column("ui_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - ui_section = Column("ui_section", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - ui_key = Column("ui_key", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - ui_value = Column("ui_value", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - ui_active = Column("ui_active", Boolean(), nullable = True, unique = None, default = True) + ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + ui_section = Column("ui_section", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + ui_key = Column("ui_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + ui_value = Column("ui_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + ui_active = Column("ui_active", Boolean(), nullable=True, unique=None, default=True) @classmethod @@ -265,26 +263,26 @@ class User(Base, BaseModel): __tablename__ = 'users' __table_args__ = (UniqueConstraint('username'), UniqueConstraint('email'), {'extend_existing':True}) - user_id = Column("user_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - username = Column("username", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - password = Column("password", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - active = Column("active", Boolean(), nullable = True, unique = None, default = None) - admin = Column("admin", Boolean(), nullable = True, unique = None, default = False) - name = Column("name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - lastname = Column("lastname", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - email = Column("email", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - last_login = Column("last_login", DateTime(timezone = False), nullable = True, unique = None, default = None) - ldap_dn = Column("ldap_dn", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - api_key = Column("api_key", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) + user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + username = Column("username", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + password = Column("password", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + active = Column("active", Boolean(), nullable=True, unique=None, default=None) + admin = Column("admin", Boolean(), nullable=True, unique=None, default=False) + name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + email = Column("email", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None) + ldap_dn = Column("ldap_dn", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + api_key = Column("api_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - user_log = relationship('UserLog', cascade = 'all') - user_perms = relationship('UserToPerm', primaryjoin = "User.user_id==UserToPerm.user_id", cascade = 'all') + user_log = relationship('UserLog', cascade='all') + user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all') repositories = relationship('Repository') - user_followers = relationship('UserFollowing', primaryjoin = 'UserFollowing.follows_user_id==User.user_id', cascade = 'all') - repo_to_perm = relationship('RepoToPerm', primaryjoin = 'RepoToPerm.user_id==User.user_id', cascade = 'all') + user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all') + repo_to_perm = relationship('RepoToPerm', primaryjoin='RepoToPerm.user_id==User.user_id', cascade='all') - group_member = relationship('UsersGroupMember', cascade = 'all') + group_member = relationship('UsersGroupMember', cascade='all') @property def full_contact(self): @@ -306,7 +304,7 @@ return self.__class__.__name__ @classmethod - def get_by_username(cls, username, case_insensitive = False): + def get_by_username(cls, username, case_insensitive=False): if case_insensitive: return Session.query(cls).filter(cls.username.ilike(username)).scalar() else: @@ -347,13 +345,13 @@ class UserLog(Base, BaseModel): __tablename__ = 'user_logs' __table_args__ = {'extend_existing':True} - user_log_id = Column("user_log_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) - repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable = False, unique = None, default = None) - repository_name = Column("repository_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - user_ip = Column("user_ip", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - action = Column("action", UnicodeText(length = 1200000, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - action_date = Column("action_date", DateTime(timezone = False), nullable = True, unique = None, default = None) + user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) + repository_name = Column("repository_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + user_ip = Column("user_ip", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + action = Column("action", UnicodeText(length=1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None) @property def action_as_day(self): @@ -367,17 +365,17 @@ __tablename__ = 'users_groups' __table_args__ = {'extend_existing':True} - users_group_id = Column("users_group_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - users_group_name = Column("users_group_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = False, unique = True, default = None) - users_group_active = Column("users_group_active", Boolean(), nullable = True, unique = None, default = None) + users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + users_group_name = Column("users_group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None) + users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None) - members = relationship('UsersGroupMember', cascade = "all, delete, delete-orphan", lazy = "joined") + members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined") def __repr__(self): return '<userGroup(%s)>' % (self.users_group_name) @classmethod - def get_by_group_name(cls, group_name, cache = False, case_insensitive = False): + def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: gr = cls.query()\ .filter(cls.users_group_name.ilike(group_name)) @@ -391,7 +389,7 @@ @classmethod - def get(cls, users_group_id, cache = False): + def get(cls, users_group_id, cache=False): users_group = cls.query() if cache: users_group = users_group.options(FromCache("sql_cache_short", @@ -417,7 +415,7 @@ def update(cls, users_group_id, form_data): try: - users_group = cls.get(users_group_id, cache = False) + users_group = cls.get(users_group_id, cache=False) for k, v in form_data.items(): if k == 'users_group_members': @@ -452,7 +450,7 @@ raise UsersGroupsAssignedException('Group assigned to %s' % assigned_groups) - users_group = cls.get(users_group_id, cache = False) + users_group = cls.get(users_group_id, cache=False) Session.delete(users_group) Session.commit() except: @@ -464,14 +462,14 @@ __tablename__ = 'users_groups_members' __table_args__ = {'extend_existing':True} - users_group_member_id = Column("users_group_member_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable = False, unique = None, default = None) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) + users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - user = relationship('User', lazy = 'joined') + user = relationship('User', lazy='joined') users_group = relationship('UsersGroup') - def __init__(self, gr_id = '', u_id = ''): + def __init__(self, gr_id='', u_id=''): self.users_group_id = gr_id self.user_id = u_id @@ -488,31 +486,31 @@ __tablename__ = 'repositories' __table_args__ = (UniqueConstraint('repo_name'), {'extend_existing':True},) - repo_id = Column("repo_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - repo_name = Column("repo_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = False, unique = True, default = None) - clone_uri = Column("clone_uri", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = False, default = None) - repo_type = Column("repo_type", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = False, unique = False, default = 'hg') - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = False, default = None) - private = Column("private", Boolean(), nullable = True, unique = None, default = None) - enable_statistics = Column("statistics", Boolean(), nullable = True, unique = None, default = True) - enable_downloads = Column("downloads", Boolean(), nullable = True, unique = None, default = True) - description = Column("description", String(length = 10000, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - created_on = Column('created_on', DateTime(timezone = False), nullable = True, unique = None, default = datetime.datetime.now) + repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None) + clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None) + repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg') + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None) + private = Column("private", Boolean(), nullable=True, unique=None, default=None) + enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True) + enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True) + description = Column("description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + created_on = Column('created_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now) - fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable = True, unique = False, default = None) - group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable = True, unique = False, default = None) + fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None) + group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None) user = relationship('User') - fork = relationship('Repository', remote_side = repo_id) + fork = relationship('Repository', remote_side=repo_id) group = relationship('Group') - repo_to_perm = relationship('RepoToPerm', cascade = 'all', order_by = 'RepoToPerm.repo_to_perm_id') - users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade = 'all') - stats = relationship('Statistics', cascade = 'all', uselist = False) + repo_to_perm = relationship('RepoToPerm', cascade='all', order_by='RepoToPerm.repo_to_perm_id') + users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade='all') + stats = relationship('Statistics', cascade='all', uselist=False) - followers = relationship('UserFollowing', primaryjoin = 'UserFollowing.follows_repo_id==Repository.repo_id', cascade = 'all') + followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all') - logs = relationship('UserLog', cascade = 'all') + logs = relationship('UserLog', cascade='all') def __repr__(self): return "<%s('%s:%s')>" % (self.__class__.__name__, @@ -730,13 +728,13 @@ if alias == 'hg': - repo = backend(safe_str(repo_full_path), create = False, - baseui = self._ui) + repo = backend(safe_str(repo_full_path), create=False, + baseui=self._ui) #skip hidden web repository if repo._get_hidden(): return else: - repo = backend(repo_full_path, create = False) + repo = backend(repo_full_path, create=False) return repo @@ -747,15 +745,15 @@ CheckConstraint('group_id != group_parent_id'), {'extend_existing':True},) __mapper_args__ = {'order_by':'group_name'} - group_id = Column("group_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - group_name = Column("group_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = False, unique = True, default = None) - group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable = True, unique = None, default = None) - group_description = Column("group_description", String(length = 10000, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) + group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + group_name = Column("group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None) + group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None) + group_description = Column("group_description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - parent_group = relationship('Group', remote_side = group_id) + parent_group = relationship('Group', remote_side=group_id) - def __init__(self, group_name = '', parent_group = None): + def __init__(self, group_name='', parent_group=None): self.group_name = group_name self.parent_group = parent_group @@ -773,7 +771,7 @@ repo_groups.extend([(x.group_id, _name(x.full_path_splitted)) for x in cls.query().all()]) - repo_groups = sorted(repo_groups, key = lambda t: t[1].split(sep)[0]) + repo_groups = sorted(repo_groups, key=lambda t: t[1].split(sep)[0]) return repo_groups @classmethod @@ -781,7 +779,7 @@ return '/' @classmethod - def get_by_group_name(cls, group_name, cache = False, case_insensitive = False): + def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: gr = cls.query()\ .filter(cls.group_name.ilike(group_name)) @@ -827,8 +825,7 @@ @property def full_path(self): - return Group.url_sep().join([g.group_name for g in self.parents] + - [self.group_name]) + return self.group_name @property def full_path_splitted(self): @@ -858,16 +855,17 @@ :param group_name: """ - path_prefix = self.parent_group.full_path_splitted if self.parent_group else [] + path_prefix = (self.parent_group.full_path_splitted if + self.parent_group else []) return Group.url_sep().join(path_prefix + [group_name]) class Permission(Base, BaseModel): __tablename__ = 'permissions' __table_args__ = {'extend_existing':True} - permission_id = Column("permission_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - permission_name = Column("permission_name", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - permission_longname = Column("permission_longname", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) + permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + permission_name = Column("permission_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + permission_longname = Column("permission_longname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) def __repr__(self): return "<%s('%s:%s')>" % (self.__class__.__name__, @@ -880,10 +878,10 @@ class RepoToPerm(Base, BaseModel): __tablename__ = 'repo_to_perm' __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'extend_existing':True}) - repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) - permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable = False, unique = None, default = None) - repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable = False, unique = None, default = None) + repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) user = relationship('User') permission = relationship('Permission') @@ -892,9 +890,9 @@ class UserToPerm(Base, BaseModel): __tablename__ = 'user_to_perm' __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'extend_existing':True}) - user_to_perm_id = Column("user_to_perm_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) - permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable = False, unique = None, default = None) + user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) user = relationship('User') permission = relationship('Permission') @@ -937,10 +935,10 @@ class UsersGroupRepoToPerm(Base, BaseModel): __tablename__ = 'users_group_repo_to_perm' __table_args__ = (UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), {'extend_existing':True}) - users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable = False, unique = None, default = None) - permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable = False, unique = None, default = None) - repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable = False, unique = None, default = None) + users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) users_group = relationship('UsersGroup') permission = relationship('Permission') @@ -951,9 +949,9 @@ class UsersGroupToPerm(Base, BaseModel): __tablename__ = 'users_group_to_perm' - users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable = False, unique = None, default = None) - permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable = False, unique = None, default = None) + users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) users_group = relationship('UsersGroup') permission = relationship('Permission') @@ -1001,10 +999,10 @@ __tablename__ = 'group_to_perm' __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing':True}) - group_to_perm_id = Column("group_to_perm_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) - permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable = False, unique = None, default = None) - group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable = False, unique = None, default = None) + group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None) user = relationship('User') permission = relationship('Permission') @@ -1013,14 +1011,14 @@ class Statistics(Base, BaseModel): __tablename__ = 'statistics' __table_args__ = (UniqueConstraint('repository_id'), {'extend_existing':True}) - stat_id = Column("stat_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable = False, unique = True, default = None) - stat_on_revision = Column("stat_on_revision", Integer(), nullable = False) - commit_activity = Column("commit_activity", LargeBinary(1000000), nullable = False)#JSON data - commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable = False)#JSON data - languages = Column("languages", LargeBinary(1000000), nullable = False)#JSON data + stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None) + stat_on_revision = Column("stat_on_revision", Integer(), nullable=False) + commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data + commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data + languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data - repository = relationship('Repository', single_parent = True) + repository = relationship('Repository', single_parent=True) class UserFollowing(Base, BaseModel): __tablename__ = 'user_followings' @@ -1028,16 +1026,16 @@ UniqueConstraint('user_id', 'follows_user_id') , {'extend_existing':True}) - user_following_id = Column("user_following_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable = False, unique = None, default = None) - follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable = True, unique = None, default = None) - follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable = True, unique = None, default = None) - follows_from = Column('follows_from', DateTime(timezone = False), nullable = True, unique = None, default = datetime.datetime.now) + user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None) + follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) + follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now) - user = relationship('User', primaryjoin = 'User.user_id==UserFollowing.user_id') + user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id') - follows_user = relationship('User', primaryjoin = 'User.user_id==UserFollowing.follows_user_id') - follows_repository = relationship('Repository', order_by = 'Repository.repo_name') + follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id') + follows_repository = relationship('Repository', order_by='Repository.repo_name') @classmethod @@ -1047,13 +1045,13 @@ class CacheInvalidation(Base, BaseModel): __tablename__ = 'cache_invalidation' __table_args__ = (UniqueConstraint('cache_key'), {'extend_existing':True}) - cache_id = Column("cache_id", Integer(), nullable = False, unique = True, default = None, primary_key = True) - cache_key = Column("cache_key", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - cache_args = Column("cache_args", String(length = 255, convert_unicode = False, assert_unicode = None), nullable = True, unique = None, default = None) - cache_active = Column("cache_active", Boolean(), nullable = True, unique = None, default = False) + cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) + cache_key = Column("cache_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + cache_args = Column("cache_args", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False) - def __init__(self, cache_key, cache_args = ''): + def __init__(self, cache_key, cache_args=''): self.cache_key = cache_key self.cache_args = cache_args self.cache_active = False @@ -1065,6 +1063,7 @@ class DbMigrateVersion(Base, BaseModel): __tablename__ = 'db_migrate_version' __table_args__ = {'extend_existing':True} - repository_id = Column('repository_id', String(250), primary_key = True) + repository_id = Column('repository_id', String(250), primary_key=True) repository_path = Column('repository_path', Text) version = Column('version', Integer) +
--- a/rhodecode/model/forms.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/model/forms.py Mon Oct 24 22:40:43 2011 +0200 @@ -193,12 +193,12 @@ class ValidAuth(formencode.validators.FancyValidator): messages = { - 'invalid_password':_('invalid password'), - 'invalid_login':_('invalid user name'), - 'disabled_account':_('Your account is disabled') - - } - #error mapping + 'invalid_password':_('invalid password'), + 'invalid_login':_('invalid user name'), + 'disabled_account':_('Your account is disabled') + } + + # error mapping e_dict = {'username':messages['invalid_login'], 'password':messages['invalid_password']} e_dict_disable = {'username':messages['disabled_account']} @@ -253,6 +253,7 @@ # db key This is an actual just the name to store in the # database repo_name_full = group_path + Group.url_sep() + repo_name + else: group_path = '' repo_name_full = repo_name @@ -616,16 +617,19 @@ return _RepoForkForm -def RepoSettingsForm(edit=False, old_data={}): +def RepoSettingsForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(), + repo_groups=[]): class _RepoForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), SlugifyName()) description = UnicodeString(strip=True, min=1, not_empty=True) + repo_group = OneOf(repo_groups, hideList=True) private = StringBoolean(if_missing=False) - chained_validators = [ValidRepoName(edit, old_data), ValidPerms, ValidSettings] + chained_validators = [ValidRepoName(edit, old_data), ValidPerms, + ValidSettings] return _RepoForm
--- a/rhodecode/model/repo.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/model/repo.py Mon Oct 24 22:40:43 2011 +0200 @@ -94,6 +94,46 @@ for gr in users_groups]) return users_groups_array + def _get_defaults(self, repo_name): + """ + Get's information about repository, and returns a dict for + usage in forms + + :param repo_name: + """ + + repo_info = Repository.get_by_repo_name(repo_name) + + if repo_info is None: + return None + + defaults = repo_info.get_dict() + group, repo_name = repo_info.groups_and_repo + defaults['repo_name'] = repo_name + defaults['repo_group'] = getattr(group[-1] if group else None, + 'group_id', None) + + # fill owner + if repo_info.user: + defaults.update({'user': repo_info.user.username}) + else: + replacement_user = User.query().filter(User.admin == + True).first().username + defaults.update({'user': replacement_user}) + + # fill repository users + for p in repo_info.repo_to_perm: + defaults.update({'u_perm_%s' % p.user.username: + p.permission.permission_name}) + + # fill repository groups + for p in repo_info.users_group_to_perm: + defaults.update({'g_perm_%s' % p.users_group.users_group_name: + p.permission.permission_name}) + + return defaults + + def update(self, repo_name, form_data): try: cur_repo = self.get_by_repo_name(repo_name, cache=False) @@ -151,7 +191,7 @@ elif k == 'repo_name': pass elif k == 'repo_group': - cur_repo.group_id = v + cur_repo.group = Group.get(v) else: setattr(cur_repo, k, v) @@ -305,7 +345,7 @@ :param parent_id: :param clone_uri: """ - from rhodecode.lib.utils import is_valid_repo,is_valid_repos_group + from rhodecode.lib.utils import is_valid_repo, is_valid_repos_group if new_parent_id: paths = Group.get(new_parent_id).full_path.split(Group.url_sep()) @@ -316,7 +356,7 @@ repo_path = os.path.join(*map(lambda x:safe_str(x), [self.repos_path, new_parent_path, repo_name])) - + # check if this path is not a repository if is_valid_repo(repo_path, self.repos_path): raise Exception('This path %s is a valid repository' % repo_path) @@ -324,7 +364,7 @@ # check if this path is a group if is_valid_repos_group(repo_path, self.repos_path): raise Exception('This path %s is a valid group' % repo_path) - + log.info('creating repo %s in %s @ %s', repo_name, repo_path, clone_uri) backend = get_backend(alias) @@ -368,3 +408,4 @@ % (datetime.today()\ .strftime('%Y%m%d_%H%M%S_%f'), repo.repo_name))) +
--- a/rhodecode/model/repos_group.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/model/repos_group.py Mon Oct 24 22:40:43 2011 +0200 @@ -50,7 +50,7 @@ q = RhodeCodeUi.get_by_key('/').one() return q.ui_value - def __create_group(self, group_name, parent_id): + def __create_group(self, group_name): """ makes repositories group on filesystem @@ -58,44 +58,30 @@ :param parent_id: """ - if parent_id: - paths = Group.get(parent_id).full_path.split(Group.url_sep()) - parent_path = os.sep.join(paths) - else: - parent_path = '' - - create_path = os.path.join(self.repos_path, parent_path, group_name) + create_path = os.path.join(self.repos_path, group_name) log.debug('creating new group in %s', create_path) if os.path.isdir(create_path): raise Exception('That directory already exists !') - os.makedirs(create_path) - - def __rename_group(self, old, old_parent_id, new, new_parent_id): + def __rename_group(self, old, new): """ Renames a group on filesystem - + :param group_name: """ + + if old == new: + log.debug('skipping group rename') + return + log.debug('renaming repos group from %s to %s', old, new) - if new_parent_id: - paths = Group.get(new_parent_id).full_path.split(Group.url_sep()) - new_parent_path = os.sep.join(paths) - else: - new_parent_path = '' - if old_parent_id: - paths = Group.get(old_parent_id).full_path.split(Group.url_sep()) - old_parent_path = os.sep.join(paths) - else: - old_parent_path = '' - - old_path = os.path.join(self.repos_path, old_parent_path, old) - new_path = os.path.join(self.repos_path, new_parent_path, new) + old_path = os.path.join(self.repos_path, old) + new_path = os.path.join(self.repos_path, new) log.debug('renaming repos paths from %s to %s', old_path, new_path) @@ -107,27 +93,27 @@ def __delete_group(self, group): """ Deletes a group from a filesystem - + :param group: instance of group from database """ paths = group.full_path.split(Group.url_sep()) paths = os.sep.join(paths) rm_path = os.path.join(self.repos_path, paths) - os.rmdir(rm_path) + if os.path.isdir(rm_path): + # delete only if that path really exists + os.rmdir(rm_path) def create(self, form_data): try: new_repos_group = Group() - new_repos_group.group_name = form_data['group_name'] - new_repos_group.group_description = \ - form_data['group_description'] - new_repos_group.group_parent_id = form_data['group_parent_id'] + new_repos_group.group_description = form_data['group_description'] + new_repos_group.parent_group = Group.get(form_data['group_parent_id']) + new_repos_group.group_name = new_repos_group.get_new_name(form_data['group_name']) self.sa.add(new_repos_group) - self.__create_group(form_data['group_name'], - form_data['group_parent_id']) + self.__create_group(new_repos_group.group_name) self.sa.commit() return new_repos_group @@ -140,23 +126,27 @@ try: repos_group = Group.get(repos_group_id) - old_name = repos_group.group_name - old_parent_id = repos_group.group_parent_id + old_path = repos_group.full_path + + # change properties + repos_group.group_description = form_data['group_description'] + repos_group.parent_group = Group.get(form_data['group_parent_id']) + repos_group.group_name = repos_group.get_new_name(form_data['group_name']) - repos_group.group_name = form_data['group_name'] - repos_group.group_description = \ - form_data['group_description'] - repos_group.group_parent_id = form_data['group_parent_id'] + new_path = repos_group.full_path self.sa.add(repos_group) - if old_name != form_data['group_name'] or (old_parent_id != - form_data['group_parent_id']): - self.__rename_group(old = old_name, old_parent_id = old_parent_id, - new = form_data['group_name'], - new_parent_id = form_data['group_parent_id']) + self.__rename_group(old_path, new_path) + + # we need to get all repositories from this new group and + # rename them accordingly to new group path + for r in repos_group.repositories: + r.repo_name = r.get_new_name(r.just_name) + self.sa.add(r) self.sa.commit() + return repos_group except: log.error(traceback.format_exc()) self.sa.rollback()
--- a/rhodecode/model/user.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/model/user.py Mon Oct 24 22:40:43 2011 +0200 @@ -49,14 +49,14 @@ class UserModel(BaseModel): - def get(self, user_id, cache = False): + def get(self, user_id, cache=False): user = self.sa.query(User) if cache: user = user.options(FromCache("sql_cache_short", "get_user_%s" % user_id)) return user.get(user_id) - def get_by_username(self, username, cache = False, case_insensitive = False): + def get_by_username(self, username, cache=False, case_insensitive=False): if case_insensitive: user = self.sa.query(User).filter(User.username.ilike(username)) @@ -68,7 +68,7 @@ "get_user_%s" % username)) return user.scalar() - def get_by_api_key(self, api_key, cache = False): + def get_by_api_key(self, api_key, cache=False): user = self.sa.query(User)\ .filter(User.api_key == api_key) @@ -96,6 +96,7 @@ """ Checks if user is in database, if not creates this user marked as ldap user + :param username: :param password: :param user_dn: @@ -103,7 +104,7 @@ """ from rhodecode.lib.auth import get_crypt_password log.debug('Checking for such ldap account in RhodeCode database') - if self.get_by_username(username, case_insensitive = True) is None: + if self.get_by_username(username, case_insensitive=True) is None: try: new_user = User() # add ldap account always lowercase @@ -152,7 +153,7 @@ def update(self, user_id, form_data): try: - user = self.get(user_id, cache = False) + user = self.get(user_id, cache=False) if user.username == 'default': raise DefaultUserException( _("You can't Edit this user since it's" @@ -174,7 +175,7 @@ def update_my_account(self, user_id, form_data): try: - user = self.get(user_id, cache = False) + user = self.get(user_id, cache=False) if user.username == 'default': raise DefaultUserException( _("You can't Edit this user since it's" @@ -196,7 +197,7 @@ def delete(self, user_id): try: - user = self.get(user_id, cache = False) + user = self.get(user_id, cache=False) if user.username == 'default': raise DefaultUserException( _("You can't remove this user since it's" @@ -222,7 +223,7 @@ from rhodecode.lib.celerylib import tasks, run_task run_task(tasks.reset_user_password, data['email']) - def fill_data(self, auth_user, user_id = None, api_key = None): + def fill_data(self, auth_user, user_id=None, api_key=None): """ Fetches auth_user by user_id,or api_key if present. Fills auth_user attributes with those taken from database. @@ -268,7 +269,7 @@ #====================================================================== # fetch default permissions #====================================================================== - default_user = self.get_by_username('default', cache = True) + default_user = self.get_by_username('default', cache=True) default_perms = self.sa.query(RepoToPerm, Repository, Permission)\ .join((Repository, RepoToPerm.repository_id == @@ -386,3 +387,4 @@ repository.repo_name] = p return user +
--- a/rhodecode/templates/settings/repo_settings.html Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/templates/settings/repo_settings.html Mon Oct 24 22:40:43 2011 +0200 @@ -34,7 +34,14 @@ ${h.text('repo_name',class_="small")} </div> </div> - + <div class="field"> + <div class="label"> + <label for="repo_group">${_('Repository group')}:</label> + </div> + <div class="input"> + ${h.select('repo_group','',c.repo_groups,class_="medium")} + </div> + </div> <div class="field"> <div class="label label-textarea"> <label for="description">${_('Description')}:</label>
--- a/rhodecode/tests/__init__.py Sun Oct 23 01:16:55 2011 +0200 +++ b/rhodecode/tests/__init__.py Mon Oct 24 22:40:43 2011 +0200 @@ -77,8 +77,6 @@ self.assertEqual(response.session['rhodecode_user'].username, username) return response.follow() - - def checkSessionFlash(self, response, msg): self.assertTrue('flash' in response.session) self.assertTrue(msg in response.session['flash'][0][1])