kallithea Changeset - f82cdb15eee3

Changeset - f82cdb15eee3

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 2 0

Marcin Kuzminski - 14 years ago 2011-10-11 08:36:52
marcin@python-works.com

Automated merge with https://bitbucket.org/marcinkuzminski/rhodecode

2 files changed with 19 insertions and 5 deletions:

rhodecode/controllers/admin/repos_groups.py

rhodecode/model/repos_group.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos_groups.py

➞

Show inline comments

@@ @@ -6,15 +6,16 @@ from formencode import htmlfill @@
 from operator import itemgetter
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from sqlalchemy.exc import IntegrityError
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator
 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Group
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.forms import ReposGroupForm
 log = logging.getLogger(__name__)
@@ @@ -164,16 +165,27 @@ class ReposGroupsController(BaseControll @@
             return redirect(url('repos_groups'))
         try:
             repos_group_model.delete(id)
             h.flash(_('removed repos group %s' % gr.group_name), category='success')
             #TODO: in future action_logger(, '', '', '', self.sa)
         except IntegrityError, e:
             if e.message.find('groups_group_parent_id_fkey'):
                 log.error(traceback.format_exc())
                 h.flash(_('Cannot delete this group it still contains '
                           'subgroups'),
                         category='warning')
             else:
                 log.error(traceback.format_exc())
                 h.flash(_('error occurred during deletion of repos '
                           'group %s' % gr.group_name), category='error')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during deletion of repos group %s' % gr.group_name),
                     category='error')
             h.flash(_('error occurred during deletion of repos '
                       'group %s' % gr.group_name), category='error')
         return redirect(url('repos_groups'))
     def show_by_name(self, group_name):
         id_ = Group.get_by_group_name(group_name).group_id
         return self.show(id_)

rhodecode/model/repos_group.py

➞

Show inline comments

@@ @@ -97,13 +97,15 @@ class ReposGroupModel(BaseModel): @@
         :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_description = form_data['group_description']
             new_repos_group.parent_group = Group.get(form_data['group_parent_id'])

0 comments (0 inline, 0 general)