Merge pull request #696 from deiwin/update/user-api-to-include-full-name
add full name to found users' list on the UI
This commit is contained in:
		
						commit
						cb6be94358
					
				| 
						 | 
				
			
			@ -303,6 +303,9 @@ var Gogits = {};
 | 
			
		|||
 | 
			
		||||
    // api working
 | 
			
		||||
    Gogits.getUsers = function (val, $target) {
 | 
			
		||||
        var notEmpty = function (str) {
 | 
			
		||||
          return str && str.length > 0;
 | 
			
		||||
        }
 | 
			
		||||
        $.ajax({
 | 
			
		||||
            url: '/api/v1/users/search?q=' + val,
 | 
			
		||||
            dataType: "json",
 | 
			
		||||
| 
						 | 
				
			
			@ -310,7 +313,11 @@ var Gogits = {};
 | 
			
		|||
                if (json.ok && json.data.length) {
 | 
			
		||||
                    var html = '';
 | 
			
		||||
                    $.each(json.data, function (i, item) {
 | 
			
		||||
                        html += '<li><img src="' + item.avatar + '">' + item.username + '</li>';
 | 
			
		||||
                        html += '<li><img src="' + item.avatar + '">' + item.username;
 | 
			
		||||
                        if (notEmpty(item.full_name)) {
 | 
			
		||||
                          html += ' (' + item.full_name + ')';
 | 
			
		||||
                        }
 | 
			
		||||
                        html += '</li>';
 | 
			
		||||
                    });
 | 
			
		||||
                    $target.toggleShow();
 | 
			
		||||
                    $target.find('ul').html(html);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -203,6 +203,9 @@ var Gogs = {};
 | 
			
		|||
 | 
			
		||||
    // Search users by keyword.
 | 
			
		||||
    Gogs.searchUsers = function (val, $target) {
 | 
			
		||||
        var notEmpty = function (str) {
 | 
			
		||||
          return str && str.length > 0;
 | 
			
		||||
        }
 | 
			
		||||
        $.ajax({
 | 
			
		||||
            url: Gogs.AppSubUrl + '/api/v1/users/search?q=' + val,
 | 
			
		||||
            dataType: "json",
 | 
			
		||||
| 
						 | 
				
			
			@ -210,7 +213,11 @@ var Gogs = {};
 | 
			
		|||
                if (json.ok && json.data.length) {
 | 
			
		||||
                    var html = '';
 | 
			
		||||
                    $.each(json.data, function (i, item) {
 | 
			
		||||
                        html += '<li><a><img src="' + item.avatar_url + '">' + item.username + '</a></li>';
 | 
			
		||||
                        html += '<li><a><img src="' + item.avatar_url + '">' + item.username;
 | 
			
		||||
                        if (notEmpty(item.full_name)) {
 | 
			
		||||
                          html += ' (' + item.full_name + ')';
 | 
			
		||||
                        }
 | 
			
		||||
                        html += '</a></li>';
 | 
			
		||||
                    });
 | 
			
		||||
                    $target.html(html);
 | 
			
		||||
                    $target.toggleShow();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue