kallithea Changeset - 1a25c408d8a4

Changeset - 1a25c408d8a4

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2019-07-31 02:00:11
mads@kiilerich.com

settings: always show permanent URL on repo settings page - the click-to-display functionality was confusing

2 files changed with 10 insertions and 9 deletions:

kallithea/controllers/admin/repos.py

kallithea/templates/admin/repos/repo_edit_settings.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -91,12 +91,13 @@ class ReposController(BaseRepoController @@
         """
         c.repo_info = self._load_repo()
         self.__load_defaults(c.repo_info)
         defaults = RepoModel()._get_defaults(c.repo_name)
         defaults['clone_uri'] = c.repo_info.clone_uri_hidden # don't show password
         defaults['permanent_url'] = c.repo_info.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=True)
         return defaults
     def index(self, format='html'):
         _list = Repository.query(sorted=True).all()

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

 ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))}
     <div class="form">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
                 <div>
                     ${h.text('repo_name',class_='form-control')}
                     <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=True)}`<br/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="permanent_url">${_('Permanent URL')}:</label>
                 <div>
                     ${h.text('permanent_url',class_='form-control', readonly='1')}
                     <span class="help-block">
                         ${_('''In case this repository is renamed or moved into another group the repository URL changes.
                                Using the above permanent URL guarantees that this repository always will be accessible on that URL.
                                This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}</span>
                                This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}
                     </span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
                 <div>
                   <div id="alter_clone_uri">
@@ @@ -97,17 +102,12 @@ ${h.form(url('update_repo', repo_name=c. @@
             </div>
     </div>
     ${h.end_form()}
 <script>
     $(document).ready(function(){
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         });
         $('#repo_landing_rev').select2({
             'dropdownAutoWidth': true
         });
         $('#repo_group').select2({
             'dropdownAutoWidth': true
         });

0 comments (0 inline, 0 general)