增加用户搜索结果

Signed-off-by: zouap <zouap@pcl.ac.cn>

public/home/search.js

@@ -121,9 +121,12 @@ function displayPrResult(page,jsonResult,onlyReturnNum,keyword){
     var total = jsonResult.Total;
     $('#pr_total').text(total);
     if(!onlyReturnNum){
+        setActivate("pr_item");
         $('#keyword_desc').text(keyword);
         $('#obj_desc').text("合并请求");
         $('#child_total').text(total);
+
+        setIssueOrPrInnerHtml(data);
     }
 }
 
@@ -132,6 +135,7 @@ function displayDataSetResult(page,jsonResult,onlyReturnNum,keyword){
     var total = jsonResult.Total;
     $('#dataset_total').text(total);
     if(!onlyReturnNum){
+        setActivate("dataset_item");
         $('#keyword_desc').text(keyword);
         $('#obj_desc').text("数据集");
         $('#child_total').text(total);
@@ -143,57 +147,45 @@ function displayOrgResult(page,jsonResult,onlyReturnNum,keyword){
     var total = jsonResult.Total;
     $('#org_total').text(total);
     if(!onlyReturnNum){
+        setActivate("org_item");
         $('#keyword_desc').text(keyword);
         $('#obj_desc').text("组织");
         $('#child_total').text(total);
     }
 }
-
+var monthDisplay=new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Spt","Oct","Nov","Dec");
 function displayUserResult(page,jsonResult,onlyReturnNum,keyword){
     var data = jsonResult.Result;
     var total = jsonResult.Total;
     $('#user_total').text(total);
     if(!onlyReturnNum){
+        setActivate("user_item");
         $('#keyword_desc').text(keyword);
         $('#obj_desc').text("用户");
         $('#child_total').text(total);
-    }
-}
-
-function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){
-    var data = jsonResult.Result;
-    var total = jsonResult.Total;
-    $('#issue_total').text(total);
-    if(!onlyReturnNum){
-        setActivate("issue_item");
-        $('#keyword_desc').text(keyword);
-        $('#obj_desc').text("任务");
-        $('#child_total').text(total);
 
         var sortHtml = "";
-        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(2,21);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">最近更新</a>"
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(3,31);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">最近更新</a>";
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(3,32);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_2\">名称自然序</a>";
+        document.getElementById("sort_type").innerHTML=sortHtml;
+
         var html = "";
         var currentTime = new Date().getTime();
         for(var i = 0; i < data.length;i++){
             var recordMap = data[i];
-            html += "<div class=\"item\">";		
+            html += "<div class=\"item members\">";	
+            html += "<img class=\"ui avatar image\" src=\"" + recordMap["avatar"] + "\"></img>";
             html += "  <div class=\"content\">";	
             html += "       <div class=\"ui header\">";
-            html += "           <a class=\"name\" href=\"/" + recordMap["repoUrl"] +"\">" + recordMap["name"] + "</a>";
+            html += "           <a class=\"name\" href=\"/" + recordMap["real_name"] +"\">" + recordMap["name"] + "</a>";
             html +="        </div>";
             html += "       <div class=\"description\">";
-            html += "           <p class=\"has-emoji\"> " + recordMap["content"] + "</p>";
-            html +="            <p class=\"time\">";
-            html +="               <i class=\"ri-code-box-line\"></i>";
-            html +="               <a class=\"am-text grey\" href=\"/" + recordMap["repoUrl"] +"/" + recordMap["id"] + "\"> " + recordMap["repoUrl"] +"#" + recordMap["id"] + "</a>";
-            html +="               <i class=\"ri-information-line am-ml-10\"></i>  ";
-            if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="false"){
-                html += "关闭";
-            }else{
-                html += "开启中";
-            }
-            html +=" <span class=\"am-ml-10\"></span>  最后更新于 <span class=\"time-since poping up\" title=\"\" data-content=\"\" data-variation=\"inverted tiny\">" + getTime(recordMap["updated_unix"],currentTime) +"</span>";
-            
+            html += "           <p class=\"has-emoji\"> " + recordMap["description"] + "</p>";
+            html +="            <p class=\"has-emoji\">";
+            html +="               <i class=\"ri-mail-line\"></i>" + recordMap["email"];           
+            html +="               <i class=\"ri-time-line am-ml-10\"></i>  加入于 ";
+            var userAddDate = new Date(recordMap["created_unix"]*1000);
+            html += monthDisplay[userAddDate.getMonth()] + " " + userAddDate.getDay() + " " + userAddDate.getFullYear();
             html +="            </p>";
             html +="        </div>";
             html +="   </div>";
@@ -203,6 +195,55 @@ function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){
     }
 }
 
+function setIssueOrPrInnerHtml(data){
+    var sortHtml = "";
+    sortHtml +="<a class=\"item\" href=\"javascript:searchItem(2,21);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">最近更新</a>";
+    document.getElementById("sort_type").innerHTML=sortHtml;
+
+    var html = "";
+    var currentTime = new Date().getTime();
+    for(var i = 0; i < data.length;i++){
+        var recordMap = data[i];
+        html += "<div class=\"item\">";		
+        html += "  <div class=\"content\">";	
+        html += "       <div class=\"ui header\">";
+        html += "           <a class=\"name\" href=\"/" + recordMap["repoUrl"] +"\">" + recordMap["name"] + "</a>";
+        html +="        </div>";
+        html += "       <div class=\"description\">";
+        html += "           <p class=\"has-emoji\"> " + recordMap["content"] + "</p>";
+        html +="            <p class=\"time\">";
+        html +="               <i class=\"ri-code-box-line\"></i>";
+        html +="               <a class=\"am-text grey\" href=\"/" + recordMap["repoUrl"] +"/" + recordMap["id"] + "\"> " + recordMap["repoUrl"] +"#" + recordMap["id"] + "</a>";
+        html +="               <i class=\"ri-information-line am-ml-10\"></i>  ";
+        if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="f"){
+            html += "关闭";
+        }else{
+            html += "开启中";
+        }
+        html +=" <span class=\"am-ml-10\"></span>  最后更新于 <span class=\"time-since poping up\" title=\"\" data-content=\"\" data-variation=\"inverted tiny\">" + getTime(recordMap["updated_unix"],currentTime) +"</span>";
+        
+        html +="            </p>";
+        html +="        </div>";
+        html +="   </div>";
+        html +="</div>";
+    }
+    document.getElementById("child_search_item").innerHTML=html;
+}
+
+function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){
+    var data = jsonResult.Result;
+    var total = jsonResult.Total;
+    $('#issue_total').text(total);
+    if(!onlyReturnNum){
+        setActivate("issue_item");
+        $('#keyword_desc').text(keyword);
+        $('#obj_desc').text("任务");
+        $('#child_total').text(total);
+
+        setIssueOrPrInnerHtml(data);
+    }
+}
+
 function setActivate(name){
     $('#repo_item').removeClass("active");
     $('#user_item').removeClass("active");
@@ -226,10 +267,10 @@ function displayRepoResult(page,jsonResult,onlyReturnNum,keyword){
         $('#child_total').text(total);
 
         var sortHtml = "";
-        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,11);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">最近更新</a>"
-        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,12);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">关注数</a>"
-        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,13);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">点赞数</a>"
-        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,14);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">Fork数</a>"      
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,11);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">最近更新</a>";
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,12);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">关注数</a>";
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,13);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">点赞数</a>";
+        sortHtml +="<a class=\"item\" href=\"javascript:searchItem(1,14);\" tabindex=\"-1\" role=\"menuitem\" id=\"menuitem_1\">Fork数</a>";
 
         document.getElementById("sort_type").innerHTML=sortHtml;
 

routers/search.go

@@ -328,6 +328,7 @@ func makeUserOrOrgResult(sRes *elastic.SearchResult, Key string, ctx *context.Co
 					record := make(map[string]interface{})
 					record["id"] = hit.Id
 					record["name"] = getLabelValue("name", recordSource, hit.Highlight)
+					record["real_name"] = recordSource["name"]
 					record["full_name"] = getLabelValue("full_name", recordSource, hit.Highlight)
 					if recordSource["description"] != nil {
 						desc := getLabelValue("description", recordSource, hit.Highlight)