Mercurial > kallithea
changeset 3629:802c94bdfc85 beta
#749 and #516 Removed dupliciting of repo settings for rhodecode admins and repo admins
- repo admin now is allowed the same set of operations as the rhodecode admin
- single logic for forms/validations/permissions
- fixes #805 update external repo via webinterface
-
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 28 Mar 2013 02:57:05 +0100 |
| parents | c734686b3cf2 |
| children | 5d8cda8e63dc |
| files | rhodecode/config/routing.py rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/settings.py rhodecode/controllers/settings.py rhodecode/model/forms.py rhodecode/model/repo.py rhodecode/model/validators.py rhodecode/templates/admin/repos/repo_edit.html rhodecode/templates/base/base.html rhodecode/templates/data_table/_dt_elements.html rhodecode/templates/settings/repo_settings.html rhodecode/templates/summary/summary.html rhodecode/tests/functional/test_admin_repos.py rhodecode/tests/functional/test_settings.py |
| diffstat | 14 files changed, 134 insertions(+), 531 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/routing.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/config/routing.py Thu Mar 28 02:57:05 2013 +0100 @@ -106,6 +106,9 @@ conditions=dict(method=["GET"])) m.connect("new_repo", "/repos/new", action="new", conditions=dict(method=["GET"])) + #TODO: refactor the name + m.connect("admin_settings_create_repository", "/create_repository", + action="create_repository", conditions=dict(method=["GET"])) m.connect("formatted_new_repo", "/repos/new.{format}", action="new", conditions=dict(method=["GET"])) m.connect("/repos/{repo_name:.*?}", @@ -114,10 +117,6 @@ m.connect("/repos/{repo_name:.*?}", action="delete", conditions=dict(method=["DELETE"], function=check_repo)) - # no longer used: - m.connect("edit_repo_admin", "/repos/{repo_name:.*?}/edit", - action="edit", conditions=dict(method=["GET"], - function=check_repo)) m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit", action="edit", conditions=dict(method=["GET"], function=check_repo)) @@ -162,6 +161,10 @@ m.connect('repo_locking', "/repo_locking/{repo_name:.*?}", action="repo_locking", conditions=dict(method=["PUT"], function=check_repo)) + m.connect('toggle_locking', "/locking_toggle/{repo_name:.*?}", + action="toggle_locking", conditions=dict(method=["GET"], + function=check_repo)) + #repo fields m.connect('create_repo_fields', "/repo_fields/{repo_name:.*?}/new", action="create_repo_field", conditions=dict(method=["PUT"], @@ -334,8 +337,6 @@ action="my_account", conditions=dict(method=["GET"])) m.connect("admin_settings_my_account_update", "/my_account_update", action="my_account_update", conditions=dict(method=["PUT"])) - m.connect("admin_settings_create_repository", "/create_repository", - action="create_repository", conditions=dict(method=["GET"])) m.connect("admin_settings_my_repos", "/my_account/repos", action="my_account_my_repos", conditions=dict(method=["GET"])) m.connect("admin_settings_my_pullrequests", "/my_account/pull_requests", @@ -466,7 +467,13 @@ controller='changeset', revision='tip', conditions=dict(function=check_repo)) - rmap.connect("edit_repo", "/{repo_name:.*?}/edit", + # no longer user, but kept for routes to work + rmap.connect("_edit_repo", "/{repo_name:.*?}/edit", + controller='admin/repos', action="edit", + conditions=dict(method=["GET"], function=check_repo) + ) + + rmap.connect("edit_repo", "/{repo_name:.*?}/settings", controller='admin/repos', action="edit", conditions=dict(method=["GET"], function=check_repo) ) @@ -635,22 +642,6 @@ controller='files', action='nodelist', conditions=dict(function=check_repo)) - rmap.connect('repo_settings_delete', '/{repo_name:.*?}/settings', - controller='settings', action="delete", - conditions=dict(method=["DELETE"], function=check_repo)) - - rmap.connect('repo_settings_update', '/{repo_name:.*?}/settings', - controller='settings', action="update", - conditions=dict(method=["PUT"], function=check_repo)) - - rmap.connect('repo_settings_home', '/{repo_name:.*?}/settings', - controller='settings', action='index', - conditions=dict(function=check_repo)) - - rmap.connect('toggle_locking', "/{repo_name:.*?}/locking_toggle", - controller='settings', action="toggle_locking", - conditions=dict(method=["GET"], function=check_repo)) - rmap.connect('repo_fork_create_home', '/{repo_name:.*?}/fork', controller='forks', action='fork_create', conditions=dict(function=check_repo, method=["POST"]))
--- a/rhodecode/controllers/admin/repos.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/controllers/admin/repos.py Thu Mar 28 02:57:05 2013 +0100 @@ -38,7 +38,7 @@ from rhodecode.lib import helpers as h from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ HasPermissionAnyDecorator, HasRepoPermissionAllDecorator, NotAnonymous,\ - HasPermissionAny, HasReposGroupPermissionAny + HasPermissionAny, HasReposGroupPermissionAny, HasRepoPermissionAnyDecorator from rhodecode.lib.base import BaseRepoController, render from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug from rhodecode.lib.helpers import get_token @@ -202,16 +202,27 @@ #redirect to our new repo ! return redirect(url('summary_home', repo_name=new_repo.repo_name)) - @HasPermissionAllDecorator('hg.admin') - def new(self, format='html'): - """ - WARNING: this function is depracated see settings.create_repo !! + @NotAnonymous() + def create_repository(self): + """GET /_admin/create_repository: Form to create a new item""" + new_repo = request.GET.get('repo', '') + parent_group = request.GET.get('parent_group') + if not HasPermissionAny('hg.admin', 'hg.create.repository')(): + #you're not super admin nor have global create permissions, + #but maybe you have at least write permission to a parent group ? + _gr = RepoGroup.get(parent_group) + gr_name = _gr.group_name if _gr else None + if not HasReposGroupPermissionAny('group.admin', 'group.write')(group_name=gr_name): + raise HTTPForbidden - GET /repos/new: Form to create a new item - """ + acl_groups = GroupList(RepoGroup.query().all(), + perm_set=['group.write', 'group.admin']) + c.repo_groups = RepoGroup.groups_choices(groups=acl_groups) + c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups) + choices, c.landing_revs = ScmModel().get_repo_landing_revs() - parent_group = request.GET.get('parent_group') - self.__load_defaults() + c.new_repo = repo_name_slug(new_repo) + ## apply the defaults from defaults page defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) if parent_group: @@ -225,7 +236,7 @@ encoding="UTF-8" ) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def update(self, repo_name): """ PUT /repos/repo_name: Update an existing item""" @@ -273,7 +284,7 @@ % repo_name, category='error') return redirect(url('edit_repo', repo_name=changed_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def delete(self, repo_name): """ DELETE /repos/repo_name: Delete an existing item""" @@ -405,7 +416,7 @@ category='error') raise HTTPInternalServerError() - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def repo_stats(self, repo_name): """ DELETE an existing repository statistics @@ -422,7 +433,7 @@ category='error') return redirect(url('edit_repo', repo_name=repo_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def repo_cache(self, repo_name): """ INVALIDATE existing repository cache @@ -439,7 +450,7 @@ category='error') return redirect(url('edit_repo', repo_name=repo_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def repo_locking(self, repo_name): """ Unlock repository when it is locked ! @@ -459,7 +470,34 @@ category='error') return redirect(url('edit_repo', repo_name=repo_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') + def toggle_locking(self, repo_name): + """ + Toggle locking of repository by simple GET call to url + + :param repo_name: + """ + + try: + repo = Repository.get_by_repo_name(repo_name) + + if repo.enable_locking: + if repo.locked[0]: + Repository.unlock(repo) + action = _('unlocked') + else: + Repository.lock(repo, c.rhodecode_user.user_id) + action = _('locked') + + h.flash(_('Repository has been %s') % action, + category='success') + except Exception, e: + log.error(traceback.format_exc()) + h.flash(_('An error occurred during unlocking'), + category='error') + return redirect(url('summary_home', repo_name=repo_name)) + + @HasRepoPermissionAllDecorator('repository.admin') def repo_public_journal(self, repo_name): """ Set's this repository to be visible in public journal, @@ -487,7 +525,7 @@ h.flash(_('Token mismatch'), category='error') return redirect(url('edit_repo', repo_name=repo_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def repo_pull(self, repo_name): """ Runs task to update given repository with remote changes, @@ -504,7 +542,7 @@ return redirect(url('edit_repo', repo_name=repo_name)) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def repo_as_fork(self, repo_name): """ Mark given repository as a fork of another @@ -531,7 +569,7 @@ """GET /repos/repo_name: Show a specific item""" # url('repo', repo_name=ID) - @HasPermissionAllDecorator('hg.admin') + @HasRepoPermissionAllDecorator('repository.admin') def edit(self, repo_name, format='html'): """GET /repos/repo_name/edit: Form to edit an existing item""" # url('edit_repo', repo_name=ID)
--- a/rhodecode/controllers/admin/settings.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/controllers/admin/settings.py Thu Mar 28 02:57:05 2013 +0100 @@ -491,40 +491,6 @@ return render('admin/users/user_edit_my_account_pullrequests.html') - @NotAnonymous() - def create_repository(self): - """GET /_admin/create_repository: Form to create a new item""" - new_repo = request.GET.get('repo', '') - parent_group = request.GET.get('parent_group') - if not HasPermissionAny('hg.admin', 'hg.create.repository')(): - #you're not super admin nor have global create permissions, - #but maybe you have at least write permission to a parent group ? - _gr = RepoGroup.get(parent_group) - gr_name = _gr.group_name if _gr else None - if not HasReposGroupPermissionAny('group.admin', 'group.write')(group_name=gr_name): - raise HTTPForbidden - - acl_groups = GroupList(RepoGroup.query().all(), - perm_set=['group.write', 'group.admin']) - c.repo_groups = RepoGroup.groups_choices(groups=acl_groups) - c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups) - choices, c.landing_revs = ScmModel().get_repo_landing_revs() - - c.new_repo = repo_name_slug(new_repo) - - ## apply the defaults from defaults page - defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) - if parent_group: - defaults.update({'repo_group': parent_group}) - - return htmlfill.render( - render('admin/repos/repo_add.html'), - defaults=defaults, - errors={}, - prefix_error=False, - encoding="UTF-8" - ) - def _get_hg_ui_settings(self): ret = RhodeCodeUi.query().all()
--- a/rhodecode/controllers/settings.py Thu Mar 28 02:11:26 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,200 +0,0 @@ -# -*- coding: utf-8 -*- -""" - rhodecode.controllers.settings - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Settings controller for rhodecode - - :created_on: Jun 30, 2010 - :author: marcink - :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com> - :license: GPLv3, see COPYING for more details. -""" -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -import logging -import traceback -import formencode - -from formencode import htmlfill - -from pylons import tmpl_context as c, request, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ - -import rhodecode.lib.helpers as h - -from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator,\ - HasRepoPermissionAnyDecorator -from rhodecode.lib.base import BaseRepoController, render -from rhodecode.lib.utils import invalidate_cache, action_logger - -from rhodecode.model.forms import RepoSettingsForm -from rhodecode.model.repo import RepoModel -from rhodecode.model.db import RepoGroup, Repository, RepositoryField -from rhodecode.model.meta import Session -from rhodecode.model.scm import ScmModel, GroupList - -log = logging.getLogger(__name__) - - -class SettingsController(BaseRepoController): - - @LoginRequired() - def __before__(self): - super(SettingsController, self).__before__() - - def __load_defaults(self): - acl_groups = GroupList(RepoGroup.query().all(), - perm_set=['group.write', 'group.admin']) - c.repo_groups = RepoGroup.groups_choices(groups=acl_groups) - 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() - choices, c.landing_revs = ScmModel().get_repo_landing_revs() - c.landing_revs_choices = choices - - def __load_data(self, repo_name=None): - """ - Load defaults settings for edit, and update - - :param repo_name: - """ - self.__load_defaults() - - c.repo_info = db_repo = Repository.get_by_repo_name(repo_name) - - if c.repo_info is None: - h.not_mapped_error(repo_name) - return redirect(url('home')) - - ##override defaults for exact repo info here git/hg etc - choices, c.landing_revs = ScmModel().get_repo_landing_revs(c.repo_info) - c.landing_revs_choices = choices - c.repo_fields = RepositoryField.query()\ - .filter(RepositoryField.repository == db_repo).all() - defaults = RepoModel()._get_defaults(repo_name) - - return defaults - - @HasRepoPermissionAllDecorator('repository.admin') - def index(self, repo_name): - defaults = self.__load_data(repo_name) - - return htmlfill.render( - render('settings/repo_settings.html'), - defaults=defaults, - encoding="UTF-8", - force_defaults=False - ) - - @HasRepoPermissionAllDecorator('repository.admin') - def update(self, repo_name): - self.__load_defaults() - repo_model = RepoModel() - changed_name = repo_name - #override the choices with extracted revisions ! - choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name) - c.landing_revs_choices = choices - repo = Repository.get_by_repo_name(repo_name) - _form = RepoSettingsForm(edit=True, - old_data={'repo_name': repo_name, - 'repo_group': repo.group.get_dict() \ - if repo.group else {}}, - repo_groups=c.repo_groups_choices, - landing_revs=c.landing_revs_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_full'] - action_logger(self.rhodecode_user, 'user_updated_repo', - changed_name, self.ip_addr, self.sa) - Session().commit() - except formencode.Invalid, errors: - defaults = self.__load_data(repo_name) - defaults.update(errors.value) - return htmlfill.render( - render('settings/repo_settings.html'), - defaults=errors.value, - errors=errors.error_dict or {}, - prefix_error=False, - encoding="UTF-8") - - except Exception: - log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of repository %s') \ - % repo_name, category='error') - - return redirect(url('repo_settings_home', repo_name=changed_name)) - - @HasRepoPermissionAllDecorator('repository.admin') - def delete(self, repo_name): - """DELETE /repos/repo_name: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # <input type="hidden" name="_method" value="DELETE" /> - # Or using helpers: - # h.form(url('repo_settings_delete', repo_name=ID), - # method='delete') - # url('repo_settings_delete', repo_name=ID) - - repo_model = RepoModel() - repo = repo_model.get_by_repo_name(repo_name) - if not repo: - h.not_mapped_error(repo_name) - return redirect(url('home')) - try: - action_logger(self.rhodecode_user, 'user_deleted_repo', - repo_name, self.ip_addr, self.sa) - repo_model.delete(repo) - invalidate_cache('get_repo_cached_%s' % repo_name) - h.flash(_('Deleted repository %s') % repo_name, category='success') - Session().commit() - except Exception: - log.error(traceback.format_exc()) - h.flash(_('An error occurred during deletion of %s') % repo_name, - category='error') - - return redirect(url('admin_settings_my_account', anchor='my')) - - @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') - def toggle_locking(self, repo_name): - """ - Toggle locking of repository by simple GET call to url - - :param repo_name: - """ - - try: - repo = Repository.get_by_repo_name(repo_name) - - if repo.enable_locking: - if repo.locked[0]: - Repository.unlock(repo) - action = _('unlocked') - else: - Repository.lock(repo, c.rhodecode_user.user_id) - action = _('locked') - - h.flash(_('Repository has been %s') % action, - category='success') - except Exception, e: - log.error(traceback.format_exc()) - h.flash(_('An error occurred during unlocking'), - category='error') - return redirect(url('summary_home', repo_name=repo_name))
--- a/rhodecode/model/forms.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/model/forms.py Thu Mar 28 02:57:05 2013 +0100 @@ -227,27 +227,6 @@ return _RepoFieldForm -def RepoSettingsForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(), - repo_groups=[], landing_revs=[]): - class _RepoForm(formencode.Schema): - allow_extra_fields = True - filter_extra_fields = False - repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True), - v.SlugifyName()) - repo_group = All(v.CanWriteGroup(old_data), - v.OneOf(repo_groups, hideList=True)) - repo_description = v.UnicodeString(strip=True, min=1, not_empty=False) - repo_private = v.StringBoolean(if_missing=False) - repo_landing_rev = v.OneOf(landing_revs, hideList=True) - clone_uri = All(v.UnicodeString(strip=True, min=1, not_empty=False)) - - chained_validators = [v.ValidCloneUri(), - v.ValidRepoName(edit, old_data), - v.ValidPerms(), - v.ValidSettings()] - return _RepoForm - - def RepoForkForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(), repo_groups=[], landing_revs=[]): class _RepoForkForm(formencode.Schema):
--- a/rhodecode/model/repo.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/model/repo.py Thu Mar 28 02:57:05 2013 +0100 @@ -297,7 +297,13 @@ new_name = cur_repo.get_new_name(kwargs['repo_name']) cur_repo.repo_name = new_name + #if private flag is set, reset default permission to NONE + if kwargs.get('repo_private'): + EMPTY_PERM = 'repository.none' + RepoModel().grant_user_permission( + repo=cur_repo, user='default', perm=EMPTY_PERM + ) #handle extra fields for field in filter(lambda k: k.startswith(RepositoryField.PREFIX), kwargs): k = RepositoryField.un_prefix_key(field)
--- a/rhodecode/model/validators.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/model/validators.py Thu Mar 28 02:57:05 2013 +0100 @@ -16,7 +16,7 @@ from rhodecode.lib.compat import OrderedSet from rhodecode.lib import ipaddr from rhodecode.lib.utils import repo_name_slug -from rhodecode.lib.utils2 import safe_int +from rhodecode.lib.utils2 import safe_int, str2bool from rhodecode.model.db import RepoGroup, Repository, UserGroup, User,\ ChangesetStatus from rhodecode.lib.exceptions import LdapImportError @@ -591,14 +591,11 @@ 'g': 'users_group' }[k[0]] if member == 'default': - if value.get('repo_private'): + if str2bool(value.get('repo_private')): # set none for default when updating to - # private repo + # private repo protects agains form manipulation v = EMPTY_PERM perms_update.add((member, v, t)) - #always set NONE when private flag is set - if value.get('repo_private'): - perms_update.add(('default', EMPTY_PERM, 'user')) value['perms_updates'] = list(perms_update) value['perms_new'] = list(perms_new)
--- a/rhodecode/templates/admin/repos/repo_edit.html Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/templates/admin/repos/repo_edit.html Thu Mar 28 02:57:05 2013 +0100 @@ -165,18 +165,19 @@ <label for="input">${_('Permissions')}:</label> </div> <div class="input"> + ${h.hidden('repo_private')} <%include file="repo_edit_perms.html"/> </div> </div> <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} - </div> + </div> </div> </div> - ${h.end_form()} + ${h.end_form()} </div> - + <div class="box box-right" style="clear:right"> <div class="title">
--- a/rhodecode/templates/base/base.html Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/templates/base/base.html Thu Mar 28 02:57:05 2013 +0100 @@ -116,11 +116,7 @@ <a href="#" class="dropdown options"></span>${_('Options')}</a> <ul> %if h.HasRepoPermissionAll('repository.admin')(c.repo_name): - %if h.HasPermissionAll('hg.admin')('access settings on repository'): <li>${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li> - %else: - <li>${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li> - %endif %endif %if c.rhodecode_db_repo.fork: <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default', merge=1),class_='compare_request')}</li>
--- a/rhodecode/templates/data_table/_dt_elements.html Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/templates/data_table/_dt_elements.html Thu Mar 28 02:57:05 2013 +0100 @@ -113,26 +113,14 @@ <%def name="repo_actions(repo_name, super_user=True)"> <div> <div style="float:left"> - %if super_user: <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('edit')}"> ${h.submit('edit_%s' % repo_name,_('edit'),class_="edit_icon action_button")} </a> - %else: - <a href="${h.url('repo_settings_home',repo_name=repo_name)}" title="${_('edit')}"> - ${h.submit('edit_%s' % repo_name,_('edit'),class_="edit_icon action_button")} - </a> - %endif </div> <div style="float:left"> - %if super_user: ${h.form(h.url('repo', repo_name=repo_name),method='delete')} ${h.submit('remove_%s' % repo_name,_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")} ${h.end_form()} - %else: - ${h.form(h.url('repo_settings_delete', repo_name=repo_name),method='delete')} - ${h.submit('remove_%s' % repo_name,_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")} - ${h.end_form()} - %endif </div> </div> </%def>
--- a/rhodecode/templates/settings/repo_settings.html Thu Mar 28 02:11:26 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -## -*- coding: utf-8 -*- -## -## See also repo_edit.html -## -<%inherit file="/base/base.html"/> - -<%def name="title()"> - ${_('%s Settings') % c.repo_name} · ${c.rhodecode_name} -</%def> - -<%def name="breadcrumbs_links()"> - ${_('Settings')} -</%def> - -<%def name="page_nav()"> - ${self.menu('repositories')} -</%def> - -<%def name="main()"> -${self.context_bar('options')} -<div class="box"> - <!-- box / title --> - <div class="title"> - ${self.breadcrumbs()} - </div> - ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')} - <div class="form"> - <!-- fields --> - <div class="fields"> - <div class="field"> - <div class="label"> - <label for="repo_name">${_('Name')}:</label> - </div> - <div class="input"> - ${h.text('repo_name',class_="medium")} - </div> - </div> - <div class="field"> - <div class="label"> - <label for="clone_uri">${_('Clone uri')}:</label> - </div> - <div class="input"> - ${h.text('clone_uri',class_="medium")} - <span class="help-block">${_('Optional http[s] url from which repository should be cloned.')}</span> - </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")} - <span class="help-block">${_('Optional select a group to put this repository into.')}</span> - </div> - </div> - <div class="field"> - <div class="label"> - <label for="landing_rev">${_('Landing revision')}:</label> - </div> - <div class="input"> - ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} - <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span> - </div> - </div> - <div class="field"> - <div class="label label-textarea"> - <label for="repo_description">${_('Description')}:</label> - </div> - <div class="textarea text-area editor"> - ${h.textarea('repo_description')} - <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> - </div> - </div> - - <div class="field"> - <div class="label label-checkbox"> - <label for="repo_private">${_('Private repository')}:</label> - </div> - <div class="checkboxes"> - ${h.checkbox('repo_private',value="True")} - <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> - </div> - </div> - %if c.visual.repository_fields: - ## EXTRA FIELDS - %for field in c.repo_fields: - <div class="field"> - <div class="label"> - <label for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> - </div> - <div class="input input-medium"> - ${h.text(field.field_key_prefixed, field.field_value, class_='medium')} - %if field.field_desc: - <span class="help-block">${field.field_desc}</span> - %endif - </div> - </div> - %endfor - %endif - <div class="field"> - <div class="label"> - <label for="input">${_('Permissions')}:</label> - </div> - <div class="input"> - <%include file="../admin/repos/repo_edit_perms.html"/> - </div> - </div> - - <div class="buttons"> - ${h.submit('save',_('Save'),class_="ui-btn large")} - ${h.reset('reset',_('Reset'),class_="ui-btn large")} - </div> - - </div> - </div> - ${h.end_form()} - - <h3>${_('Delete')}</h3> - ${h.form(url('repo_settings_delete', repo_name=c.repo_info.repo_name),method='delete')} - <div class="form"> - <div class="fields"> - <div class="field" style="border:none;color:#888"> - <div class="label"> - <label for="">${_('Remove repository')}:</label> - </div> - <div class="checkboxes"> - ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")} - <ul> - <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need to fully delete it from file system please do it manually')}</li> - </ul> - </div> - </div> - </div> - </div> - ${h.end_form()} - -</div> -</%def>
--- a/rhodecode/templates/summary/summary.html Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/templates/summary/summary.html Thu Mar 28 02:57:05 2013 +0100 @@ -179,11 +179,7 @@ %if h.HasRepoPermissionAll('repository.admin')(c.repo_name): <li> - %if h.HasPermissionAll('hg.admin')('access settings on repository'): ${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')} - %else: - ${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')} - %endif </li> %endif
--- a/rhodecode/tests/functional/test_admin_repos.py Thu Mar 28 02:11:26 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_repos.py Thu Mar 28 02:57:05 2013 +0100 @@ -4,10 +4,21 @@ import urllib from rhodecode.lib import vcs -from rhodecode.model.db import Repository, RepoGroup +from rhodecode.model.db import Repository, RepoGroup, UserRepoToPerm, User,\ + Permission from rhodecode.tests import * from rhodecode.model.repos_group import ReposGroupModel from rhodecode.model.repo import RepoModel +from rhodecode.model.meta import Session + + +def _get_permission_for_user(user, repo): + perm = UserRepoToPerm.query()\ + .filter(UserRepoToPerm.repository == + Repository.get_by_repo_name(repo))\ + .filter(UserRepoToPerm.user == User.get_by_username(user))\ + .all() + return perm class TestAdminReposController(TestController): @@ -200,13 +211,6 @@ except: self.fail('no repo %s in filesystem' % repo_name) - def test_new(self): - self.log_user() - response = self.app.get(url('new_repo')) - - def test_new_as_xml(self): - response = self.app.get(url('formatted_new_repo', format='xml')) - def test_update(self): response = self.app.put(url('repo', repo_name=HG_REPO)) @@ -328,3 +332,42 @@ def test_edit(self): response = self.app.get(url('edit_repo', repo_name=HG_REPO)) + + def test_set_private_flag_sets_default_to_none(self): + self.log_user() + #initially repository perm should be read + perm = _get_permission_for_user(user='default', repo=HG_REPO) + self.assertTrue(len(perm), 1) + self.assertEqual(perm[0].permission.permission_name, 'repository.read') + self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, False) + + response = self.app.put(url('repo', repo_name=HG_REPO), + _get_repo_create_params(repo_private=1, + repo_name=HG_REPO, + user=TEST_USER_ADMIN_LOGIN)) + self.checkSessionFlash(response, + msg='Repository %s updated successfully' % (HG_REPO)) + self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, True) + + #now the repo default permission should be None + perm = _get_permission_for_user(user='default', repo=HG_REPO) + self.assertTrue(len(perm), 1) + self.assertEqual(perm[0].permission.permission_name, 'repository.none') + + response = self.app.put(url('repo', repo_name=HG_REPO), + _get_repo_create_params(repo_private=False, + repo_name=HG_REPO, + user=TEST_USER_ADMIN_LOGIN)) + self.checkSessionFlash(response, + msg='Repository %s updated successfully' % (HG_REPO)) + self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, False) + + #we turn off private now the repo default permission should stay None + perm = _get_permission_for_user(user='default', repo=HG_REPO) + self.assertTrue(len(perm), 1) + self.assertEqual(perm[0].permission.permission_name, 'repository.none') + + #update this permission back + perm[0].permission = Permission.get_by_key('repository.read') + Session().add(perm[0]) + Session().commit()
--- a/rhodecode/tests/functional/test_settings.py Thu Mar 28 02:11:26 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -from rhodecode.tests import * -from rhodecode.model.db import UserRepoToPerm, Repository, User, Permission -from rhodecode.model.meta import Session - - -def _get_permission_for_user(user, repo): - perm = UserRepoToPerm.query()\ - .filter(UserRepoToPerm.repository == - Repository.get_by_repo_name(repo))\ - .filter(UserRepoToPerm.user == User.get_by_username(user))\ - .all() - return perm - - -class TestSettingsController(TestController): - - def test_index(self): - self.log_user() - response = self.app.get(url(controller='settings', action='index', - repo_name=HG_REPO)) - # Test response... - - def test_set_private_flag_sets_default_to_none(self): - self.log_user() - #initially repository perm should be read - perm = _get_permission_for_user(user='default', repo=HG_REPO) - self.assertTrue(len(perm), 1) - self.assertEqual(perm[0].permission.permission_name, 'repository.read') - self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, False) - - response = self.app.put(url('repo', repo_name=HG_REPO), - _get_repo_create_params(repo_private=1, - repo_name=HG_REPO, - user=TEST_USER_ADMIN_LOGIN)) - self.checkSessionFlash(response, - msg='Repository %s updated successfully' % (HG_REPO)) - self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, True) - - #now the repo default permission should be None - perm = _get_permission_for_user(user='default', repo=HG_REPO) - self.assertTrue(len(perm), 1) - self.assertEqual(perm[0].permission.permission_name, 'repository.none') - - response = self.app.put(url('repo', repo_name=HG_REPO), - _get_repo_create_params(repo_private=False, - repo_name=HG_REPO, - user=TEST_USER_ADMIN_LOGIN)) - self.checkSessionFlash(response, - msg='Repository %s updated successfully' % (HG_REPO)) - self.assertEqual(Repository.get_by_repo_name(HG_REPO).private, False) - - #we turn off private now the repo default permission should stay None - perm = _get_permission_for_user(user='default', repo=HG_REPO) - self.assertTrue(len(perm), 1) - self.assertEqual(perm[0].permission.permission_name, 'repository.none') - - #update this permission back - perm[0].permission = Permission.get_by_key('repository.read') - Session().add(perm[0]) - Session().commit()