kallithea Changeset - 790f01320369

Changeset - 790f01320369

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Thomas De Schampheleire - 10 years ago 2015-06-29 17:42:39
thomas.de.schampheleire@gmail.com

autocomplete: fix completion of repository owner

The owner field of a repository setting was supposed to be autocompletable,
but never really did (at least not in Kallithea, probably it once did in
Rhodecode).

Instead of making yet another 'OwnerAutoComplete', make a generic
SimpleUserAutoComplete that can be reused in other places that only need
completion of a text input field.

3 files changed with 23 insertions and 11 deletions:

kallithea/controllers/admin/repos.py

kallithea/public/js/base.js

kallithea/templates/admin/repos/repo_edit_settings.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -370,6 +370,8 @@ class ReposController(BaseRepoController @@
         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(
             render('admin/repos/repo_edit.html'),

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1242,24 +1242,34 @@ var autocompleteCreate = function (input @@
     return autocomplete;
+}
-var _MembersAutoComplete = function (divid, cont, users_list, groups_list) {
+var SimpleUserAutoComplete = function (divid, cont, users_list) {
     var matchUsers = function (sQuery) {
         return autocompleteMatchUsers(sQuery, users_list);
+    }
     var matchGroups = function (sQuery) {
         return autocompleteMatchGroups(sQuery, groups_list);
+    }
     var userAC = autocompleteCreate(divid, cont, matchUsers);
     // Handler for selection of an entry
     var itemSelectHandler = function (sType, aArgs) {
         var myAC = aArgs[0]; // reference back to the AC instance
         var elLI = aArgs[1]; // reference to the selected LI element
         var oData = aArgs[2]; // object literal of selected item's result data
         myAC.getInputEl().value = oData.nname;
     };
     userAC.itemSelectEvent.subscribe(itemSelectHandler);
+}
 var _MembersAutoComplete = function (divid, cont, users_list, groups_list) {
     var matchAll = function (sQuery) {
         var u = matchUsers(sQuery);
         var g = matchGroups(sQuery);
         var u = autocompleteMatchUsers(sQuery, users_list);
         var g = autocompleteMatchGroups(sQuery, groups_list);
         return u.concat(g);
     };
     var membersAC = autocompleteCreate(divid, cont, matchAll);
     var ownerAC = autocompleteCreate("user", "owner_container", matchUsers);
     // Handler for selection of an entry
     var itemSelectHandler = function (sType, aArgs) {
         var nextId = divid.split('perm_new_member_name_')[1];
@@ @@ -1278,9 +1288,6 @@ var _MembersAutoComplete = function (div @@
+        }
     };
     membersAC.itemSelectEvent.subscribe(itemSelectHandler);
     if(ownerAC.itemSelectEvent){
         ownerAC.itemSelectEvent.subscribe(itemSelectHandler);
+    }
+}
 var MentionsAutoComplete = function (divid, cont, users_list) {

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -162,5 +162,8 @@ ${h.form(url('repo', repo_name=c.repo_in @@
             'dropdownAutoWidth': true
         });
         // autocomplete
         var _USERS_AC_DATA = ${c.users_array|n};
         SimpleUserAutoComplete('user', 'owner_container', _USERS_AC_DATA);
     });
 </script>

0 comments (0 inline, 0 general)