kallithea Changeset - fdf6df128d89

Changeset - fdf6df128d89

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 10 years ago 2015-07-23 00:52:29
madski@unity3d.com

remote: simplify clone_uri UI

The UI was a bit weird ... probably in an attempt of making it editable while
hiding passwords. Instead, just show the URL with password hidden, and only
save it back if it changed.

The UI only contains the clone_uri with passwords hidden. It will thus only be
saved when the form result is different from the value that was shown to the
user.

6 files changed with 20 insertions and 54 deletions:

kallithea/controllers/admin/repos.py

kallithea/lib/helpers.py

kallithea/model/forms.py

kallithea/model/repo.py

kallithea/model/validators.py

kallithea/templates/admin/repos/repo_edit_settings.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -105,12 +105,13 @@ class ReposController(BaseRepoController @@
         self.__load_defaults(c.repo_info)
         ##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
         defaults = RepoModel()._get_defaults(repo_name)
         defaults['clone_uri'] = c.repo_info.clone_uri_hidden # don't show password
         return defaults
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
@@ @@ -228,15 +229,14 @@ class ReposController(BaseRepoController @@
                 if task.failed():
                     raise HTTPInternalServerError(task.traceback)
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:
             if repo.clone_uri:
                 clone_uri = repo.clone_uri_hidden
                 h.flash(_('Created repository %s from %s')
-                        % (repo.repo_name, clone_uri), category='success')
+                        % (repo.repo_name, repo.clone_uri_hidden), category='success')
             else:
                 repo_url = h.link_to(repo.repo_name,
                                      h.url('summary_home',
                                            repo_name=repo.repo_name))
                 fork = repo.fork
                 if fork:
@@ @@ -362,15 +362,12 @@ class ReposController(BaseRepoController @@
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
         defaults = self.__load_data(repo_name)
         if 'clone_uri' in defaults:
             del defaults['clone_uri']
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == c.repo_info).all()
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.active = 'settings'
         return htmlfill.render(

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -26,13 +26,12 @@ import urlparse @@
 import textwrap
 from pygments.formatters.html import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url
 from pylons.i18n.translation import _, ungettext
 from hashlib import md5 # used as h.md5
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, hidden, image, javascript_link, link_to, \

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -229,13 +229,14 @@ def RepoForm(edit=False, old_data={}, su @@
         repo_enable_downloads = v.StringBoolean(if_missing=False)
         repo_enable_locking = v.StringBoolean(if_missing=False)
         if edit:
             #this is repo owner
             user = All(v.UnicodeString(not_empty=True), v.ValidRepoUser())
             clone_uri_change = v.UnicodeString(not_empty=False, if_missing=v.Missing)
             # Not a real field - just for reference for validation:
             # clone_uri_hidden = v.UnicodeString(if_missing='')
         chained_validators = [v.ValidCloneUri(),
                               v.ValidRepoName(edit, old_data)]
     return _RepoForm

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -322,31 +322,24 @@ class RepoModel(BaseModel): @@
             if 'user' in kwargs:
                 cur_repo.user = User.get_by_username(kwargs['user'])
             if 'repo_group' in kwargs:
                 cur_repo.group = RepoGroup.get(kwargs['repo_group'])
             log.debug('Updating repo %s with params:%s' % (cur_repo, kwargs))
             for strip, k in [(1, 'repo_enable_downloads'),
                              (1, 'repo_description'),
                              (1, 'repo_enable_locking'),
                              (1, 'repo_landing_rev'),
                              (1, 'repo_private'),
                              (1, 'repo_enable_statistics'),
                              (0, 'clone_uri'),]:
             for k in ['repo_enable_downloads',
                       'repo_description',
                       'repo_enable_locking',
                       'repo_landing_rev',
                       'repo_private',
                       'repo_enable_statistics',
                       ]:
                 if k in kwargs:
                     val = kwargs[k]
                     if strip:
                         k = remove_prefix(k, 'repo_')
                     if k == 'clone_uri':
                         from kallithea.model.validators import Missing
                         _change = kwargs.get('clone_uri_change')
                         if _change == Missing:
                             # we don't change the value, so use original one
                             val = cur_repo.clone_uri
                     setattr(cur_repo, k, val)
                     setattr(cur_repo, remove_prefix(k, 'repo_'), kwargs[k])
             clone_uri = kwargs.get('clone_uri')
             if clone_uri is not None and clone_uri != cur_repo.clone_uri_hidden:
                 cur_repo.clone_uri = clone_uri
             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'):

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -41,17 +41,12 @@ from kallithea.lib.auth import HasRepoGr @@
 # silence warnings and pylint
 UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set, \
     NotEmpty, IPAddress, CIDR, String, FancyValidator
 log = logging.getLogger(__name__)
 class _Missing(object):
     pass
 Missing = _Missing()
 class StateObj(object):
     """
     this is needed to translate the messages using _() in validators
     """
     _ = staticmethod(_)
@@ @@ -477,15 +472,13 @@ def ValidCloneUri(): @@
+        }
         def validate_python(self, value, state):
             repo_type = value.get('repo_type')
             url = value.get('clone_uri')
             if not url:
                 pass
             else:
             if url and url != value.get('clone_uri_hidden'):
                 try:
                     url_handler(repo_type, url, make_ui('db', clear_session=False))
                 except Exception:
                     log.exception('URL validation failed')
                     msg = M(self, 'clone_uri')
                     raise formencode.Invalid(msg, value, state,

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -18,25 +18,16 @@ ${h.form(url('repo', repo_name=c.repo_in @@
             </div>
             <div class="field">
                 <div class="label">
                     <label for="clone_uri">${_('Remote repository')}:</label>
                 </div>
                 <div class="input">
                   %if c.repo_info.clone_uri:
                     <div id="clone_uri_hidden" style="font-size: 14px">
                         <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>
                         <span style="cursor: pointer; padding: 0px 0px 5px 0px" id="edit_clone_uri"><i class="icon-edit"></i>${_('Edit')}</span>
                     </div>
                     <div id="alter_clone_uri" style="display: none">
                         ${h.text('clone_uri',class_="medium", placeholder=_('New URL'))}
                     </div>
                   %else:
                     ## not set yet, display form to set it
                     ${h.text('clone_uri',class_="medium")}
                     ${h.hidden('clone_uri_change', 'NEW')}
                   %endif
                   <div id="alter_clone_uri">
                         ${h.text('clone_uri',class_="medium", placeholder=_('Repository URL'))}
                         ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)}
                   </div>
                   <span id="alter_clone_uri_help_block" class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')}
                   </span>
                 </div>
             </div>
             <div class="field">
@@ @@ -143,20 +134,12 @@ ${h.form(url('repo', repo_name=c.repo_in @@
 <script>
     $(document).ready(function(){
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         });
         $('#edit_clone_uri').on('click', function(e){
           $('#alter_clone_uri').show();
           $('#edit_clone_uri').hide();
           $('#clone_uri_hidden').hide();
           ## store hash of old value for change detection
           var uri_change = '<input id="clone_uri_change" name="clone_uri_change" type="hidden" value="${h.md5(c.repo_info.clone_uri or "").hexdigest()}" />';
           $('#alter_clone_uri_help_block').html($('#alter_clone_uri_help_block').html()+" ("+$('#clone_uri_hidden_value').html()+")");
         });
         $('#repo_landing_rev').select2({
             'dropdownAutoWidth': true
         });
         $('#repo_group').select2({
             'dropdownAutoWidth': true

0 comments (0 inline, 0 general)