kallithea Changeset - 5242b1619603

Changeset - 5242b1619603

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2012-03-16 12:21:17
marcin@python-works.com

#401 repository group is automatically pre-selected when adding repos inside a repository group

4 files changed with 8 insertions and 2 deletions:

docs/changelog.rst

rhodecode/controllers/home.py

rhodecode/templates/admin/repos/repo_add_base.html

rhodecode/templates/index_base.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ news @@
 - added clone-url into edit form on /settings page
 - added help text into repo add/edit forms
 - created rcextensions module with additional mappings (ref #322) and
   post push/pull/create repo hooks callbacks
 - implemented #377 Users view for his own permissions on account page
 - #399 added inheritance of permissions for users group on repos groups
 - #401 repository group is automatically pre-selected when adding repos
   inside a repository group
 fixes
 +++++
 - fixed #390 cache invalidation problems on repos inside group
 - fixed #385 clone by ID url was loosing proxy prefix in URL

rhodecode/controllers/home.py

➞

Show inline comments

@@ @@ -41,13 +41,13 @@ class HomeController(BaseController): @@
     def __before__(self):
         super(HomeController, self).__before__()
     def index(self):
         c.repos_list = self.scm_model.get_repos()
         c.groups = self.scm_model.get_repos_groups()
+        c.group = None
         return render('/index.html')
     def repo_switcher(self):
         if request.is_xhr:
             all_repos = Repository.query().order_by(Repository.repo_name).all()
             c.repos_list = self.scm_model.get_repos(all_repos,

rhodecode/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ ${h.form(url('repos'))} @@
          </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")}
+                 ${h.select('repo_group',request.GET.get('parent_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="repo_type">${_('Type')}:</label>

rhodecode/templates/index_base.html

➞

Show inline comments

@@ @@ -6,13 +6,17 @@ @@
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> ${parent.breadcrumbs()} <span id="repo_count">0</span> ${_('repositories')}
             </h5>
             %if c.rhodecode_user.username != 'default':
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                 <ul class="links">
                   <li>
                   %if c.group:
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
                   %else:
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
                   %endif
                   </li>
                 </ul>
                 %endif
             %endif
         </div>
         <!-- end box / title -->

0 comments (0 inline, 0 general)