@@ -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 @@ class ReposController(BaseController):
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 @@ class ReposController(BaseController):
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:
defaults = RepoModel()._get_defaults(repo_name)
return defaults
@HasPermissionAllDecorator('hg.admin')
@@ -2,7 +2,8 @@ import traceback
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
@@ -297,8 +298,8 @@ class ApiController(JSONRPCController):
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
@@ -364,7 +365,8 @@ class ApiController(JSONRPCController):
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'
@@ -42,7 +42,7 @@ from rhodecode.lib.utils import invalida
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__)
@@ -53,6 +53,14 @@ class SettingsController(BaseRepoControl
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):
@@ -66,28 +74,9 @@ class SettingsController(BaseRepoControl
return redirect(url('home'))
self.__load_defaults()
return htmlfill.render(
render('settings/repo_settings.html'),
@@ -100,15 +89,20 @@ class SettingsController(BaseRepoControl
def update(self, repo_name):
changed_name = repo_name
_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)
except formencode.Invalid, errors:
@@ -30,11 +30,8 @@ import traceback
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,6 +125,7 @@ class BaseModel(object):
@classmethod
def get(cls, id_):
if id_:
return cls.query().get(id_)
@@ -827,8 +825,7 @@ class Group(Base, BaseModel):
@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
def full_path_splitted(self):
@@ -858,7 +855,8 @@ class Group(Base, BaseModel):
: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])
@@ -1068,3 +1066,4 @@ class DbMigrateVersion(Base, BaseModel):
repository_id = Column('repository_id', String(250), primary_key = True)
repository_path = Column('repository_path', Text)
version = Column('version', Integer)
@@ -196,8 +196,8 @@ class ValidAuth(formencode.validators.Fa
'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']}
@@ -253,6 +253,7 @@ def ValidRepoName(edit, old_data):
# db key This is an actual just the name to store in the
# database
repo_name_full = group_path + Group.url_sep() + repo_name
group_path = ''
repo_name_full = repo_name
@@ -616,16 +617,19 @@ def RepoForkForm(edit=False, old_data={}
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
@@ -94,6 +94,46 @@ class RepoModel(BaseModel):
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
# fill owner
if repo_info.user:
defaults.update({'user': repo_info.user.username})
replacement_user = User.query().filter(User.admin ==
True).first().username
# fill repository users
for p in repo_info.repo_to_perm:
# fill repository groups
for p in repo_info.users_group_to_perm:
def update(self, repo_name, form_data):
cur_repo = self.get_by_repo_name(repo_name, cache=False)
@@ -151,7 +191,7 @@ class RepoModel(BaseModel):
elif k == 'repo_name':
pass
elif k == 'repo_group':
cur_repo.group_id = v
cur_repo.group = Group.get(v)
setattr(cur_repo, k, v)
@@ -368,3 +408,4 @@ class RepoModel(BaseModel):
% (datetime.today()\
.strftime('%Y%m%d_%H%M%S_%f'),
repo.repo_name)))
@@ -50,7 +50,7 @@ class ReposGroupModel(BaseModel):
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 @@ class ReposGroupModel(BaseModel):
:param parent_id:
if parent_id:
paths = Group.get(parent_id).full_path.split(Group.url_sep())
parent_path = os.sep.join(paths)
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
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)
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)
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)
@@ -114,20 +100,20 @@ class ReposGroupModel(BaseModel):
paths = os.sep.join(paths)
rm_path = os.path.join(self.repos_path, paths)
if os.path.isdir(rm_path):
# delete only if that path really exists
os.rmdir(rm_path)
def create(self, form_data):
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 @@ class ReposGroupModel(BaseModel):
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
repos_group.group_name = form_data['group_name']
repos_group.group_description = \
repos_group.group_parent_id = form_data['group_parent_id']
# 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'])
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)
return repos_group
except:
self.sa.rollback()
@@ -96,6 +96,7 @@ class UserModel(BaseModel):
Checks if user is in database, if not creates this user marked
as ldap user
:param username:
:param password:
:param user_dn:
@@ -386,3 +387,4 @@ class UserModel(BaseModel):
repository.repo_name] = p
return user
@@ -34,7 +34,14 @@
${h.text('repo_name',class_="small")}
</div>
<div class="field">
<div class="label">
<label for="repo_group">${_('Repository group')}:</label>
<div class="input">
${h.select('repo_group','',c.repo_groups,class_="medium")}
<div class="label label-textarea">
<label for="description">${_('Description')}:</label>
@@ -77,8 +77,6 @@ class TestController(TestCase):
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])
Status change: