diff --git a/public/home/search.js b/public/home/search.js index 6fa8cb640..22eded77d 100644 --- a/public/home/search.js +++ b/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 +="最近更新" + sortHtml +="最近更新"; + sortHtml +="名称自然序"; + 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 += "
" + recordMap["content"] + "
"; - html +=""; - html +=" "; - html +=" " + recordMap["repoUrl"] +"#" + recordMap["id"] + ""; - html +=" "; - if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="false"){ - html += "关闭"; - }else{ - html += "开启中"; - } - html +=" 最后更新于 " + getTime(recordMap["updated_unix"],currentTime) +""; - + html += "
" + recordMap["description"] + "
"; + html +=""; + html +=" " + recordMap["email"]; + html +=" 加入于 "; + var userAddDate = new Date(recordMap["created_unix"]*1000); + html += monthDisplay[userAddDate.getMonth()] + " " + userAddDate.getDay() + " " + userAddDate.getFullYear(); html +="
"; html +="" + recordMap["content"] + "
"; + html +=""; + html +=" "; + html +=" " + recordMap["repoUrl"] +"#" + recordMap["id"] + ""; + html +=" "; + if(isEmpty(recordMap["is_closed"]) || recordMap["is_closed"]=="f"){ + html += "关闭"; + }else{ + html += "开启中"; + } + html +=" 最后更新于 " + getTime(recordMap["updated_unix"],currentTime) +""; + + html +="
"; + html +="