kallithea Changeset - f282c81ff532

Changeset - f282c81ff532

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-02-21 00:41:48
marcin@python-works.com

implemented #689 Deleting Repositories with Forks Should Be Easier
- optionally detach or delete forks associated to repo

2 files changed with 19 insertions and 0 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/templates/admin/repos/repo_edit.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -265,48 +265,62 @@ class ReposController(BaseRepoController @@
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repository %s') \
                     % repo_name, category='error')
         return redirect(url('edit_repo', repo_name=changed_name))
     @HasPermissionAllDecorator('hg.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', repo_name=ID),
         #           method='delete')
         # url('repo', 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('repos'))
         try:
             _forks = repo.forks.count()
             if _forks and request.POST.get('forks'):
                 do = request.POST['forks']
                 if do == 'detach_forks':
                     for r in repo.forks:
                         log.debug('Detaching fork %s from repo %s' % (r, repo))
                         r.fork = None
                         Session().add(r)
                     h.flash(_('detached %s forks') % _forks, category='success')
                 elif do == 'delete_forks':
                     for r in repo.forks:
                         log.debug('Deleting fork %s of repo %s' % (r, repo))
                         repo_model.delete(r)
                     h.flash(_('deleted %s forks') % _forks, category='success')
             action_logger(self.rhodecode_user, 'admin_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 IntegrityError, e:
             if e.message.find('repositories_fork_id_fkey') != -1:
                 log.error(traceback.format_exc())
                 h.flash(_('Cannot delete %s it still contains attached '
                           'forks') % repo_name,
                         category='warning')
             else:
                 log.error(traceback.format_exc())
                 h.flash(_('An error occurred during '
                           'deletion of %s') % repo_name,
                         category='error')
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
         return redirect(url('repos'))

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -270,48 +270,53 @@ @@
            </div>
         </div>
         ${h.end_form()}
         <h3>${_('Set as fork of')}</h3>
         ${h.form(url('repo_as_fork', repo_name=c.repo_info.repo_name),method='put')}
         <div class="form">
            <div class="fields">
                ${h.select('id_fork_of','',c.repos_list,class_="medium")}
                ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('set'),class_="ui-btn",)}
            </div>
                <div class="field" style="border:none;color:#888">
                <ul>
                     <li>${_('''Manually set this repository as a fork of another from the list''')}</li>
                </ul>
                </div>
         </div>
         ${h.end_form()}
         <h3>${_('Delete')}</h3>
         ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')}
         <div class="form">
            <div class="fields">
                ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
               %if c.repo_info.forks.count():
                     - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
                     <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
                     <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
               %endif
            </div>
            <div class="field" style="border:none;color:#888">
            <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>
         ${h.end_form()}
 </div>
 ##TODO: this should be controlled by the VISUAL setting
 %if c.visual.repository_fields:
 <div class="box box-left" style="clear:left">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Extra fields')}</h5>
     </div>
     <div class="emails_wrap">
       <table class="noborder">
       %for field in c.repo_fields:
         <tr>
             <td>${field.field_label} (${field.field_key})</td>
             <td>${field.field_type}</td>

0 comments (0 inline, 0 general)