diff --git a/models/search_record.go b/models/search_record.go index 706abcbaa..d9d85a591 100644 --- a/models/search_record.go +++ b/models/search_record.go @@ -71,7 +71,7 @@ func SearchDatasetBySQL(Page int, PageSize int, Keyword string, userId int64) ([ } setDataSetQueryCondition(sess, Keyword, userId) - sess.Desc("issue.created_unix") + sess.Desc("dataset.created_unix") sess.Limit(PageSize, (Page-1)*PageSize) datasets := make([]*Dataset, 0) if err := sess.Find(&datasets); err != nil { diff --git a/public/home/search.js b/public/home/search.js index 144810566..b85c53f5b 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -335,9 +335,10 @@ function displayDataSetResult(page,jsonResult,onlyReturnNum,keyword){ $('#dataset_total').text(total); if(!onlyReturnNum){ setActivate("dataset_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text(getLabel(isZh,"search_dataset")); - $('#child_total').text(total); + //$('#keyword_desc').text(keyword); + //$('#obj_desc').text(getLabel(isZh,"search_dataset")); + //$('#child_total').text(total); + $('#find_title').text(getLabel(isZh,"find_title").replace('{keyword}',keyword).replace('{tablename}',getLabel(isZh,"search_dataset")).replace('{total}',total)); var sortHtml = ""; sortHtml +=""+ getLabel(isZh,"search_matched") + ""; @@ -385,9 +386,10 @@ function displayOrgResult(page,jsonResult,onlyReturnNum,keyword){ $('#org_total').text(total); if(!onlyReturnNum){ setActivate("org_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text(getLabel(isZh,"search_org")); - $('#child_total').text(total); + //$('#keyword_desc').text(keyword); + //$('#obj_desc').text(getLabel(isZh,"search_org")); + //$('#child_total').text(total); + $('#find_title').text(getLabel(isZh,"find_title").replace('{keyword}',keyword).replace('{tablename}',getLabel(isZh,"search_org")).replace('{total}',total)); var sortHtml = ""; sortHtml +=""+ getLabel(isZh,"search_matched") + ""; @@ -434,9 +436,11 @@ function displayUserResult(page,jsonResult,onlyReturnNum,keyword){ $('#user_total').text(total); if(!onlyReturnNum){ setActivate("user_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text(getLabel(isZh,"search_user")); - $('#child_total').text(total); + //$('#keyword_desc').text(keyword); + //$('#obj_desc').text(getLabel(isZh,"search_user")); + //$('#child_total').text(total); + + $('#find_title').text(getLabel(isZh,"find_title").replace('{keyword}',keyword).replace('{tablename}',getLabel(isZh,"search_user")).replace('{total}',total)); var sortHtml = "";//equal user sort by sortHtml +=""+ getLabel(isZh,"search_matched") + ""; @@ -524,9 +528,10 @@ function displayIssueResult(page,jsonResult,onlyReturnNum,keyword){ $('#issue_total').text(total); if(!onlyReturnNum){ setActivate("issue_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text(getLabel(isZh,"search_issue")); - $('#child_total').text(total); + //$('#keyword_desc').text(keyword); + //$('#obj_desc').text(getLabel(isZh,"search_issue")); + //$('#child_total').text(total); + $('#find_title').text(getLabel(isZh,"find_title").replace('{keyword}',keyword).replace('{tablename}',getLabel(isZh,"search_issue")).replace('{total}',total)); setIssueOrPrInnerHtml(data,"issues"); } @@ -550,9 +555,10 @@ function displayRepoResult(page,jsonResult,onlyReturnNum,keyword){ if(!onlyReturnNum){ setActivate("repo_item"); - $('#keyword_desc').text(keyword); - $('#obj_desc').text(getLabel(isZh,"search_repo")); - $('#child_total').text(total); + // $('#keyword_desc').text(keyword); + //$('#obj_desc').text(getLabel(isZh,"search_repo")); + //$('#child_total').text(total); + $('#find_title').text(getLabel(isZh,"find_title").replace('{keyword}',keyword).replace('{tablename}',getLabel(isZh,"search_repo")).replace('{total}',total)); var sortHtml = ""; sortHtml +=""+ getLabel(isZh,"search_matched") + ""; @@ -1133,7 +1139,8 @@ var zhCN={ "search_home_page":"首页", "search_last_page":"末页", "search_go_to":"前往", - "search_go_page":"页" + "search_go_page":"页", + "find_title":"找到“{keyword}”相关{tablename}约为{total}个" } var esUN={ @@ -1166,7 +1173,8 @@ var zhCN={ "search_home_page":"Home", "search_last_page":"Last", "search_go_to":"Go", - "search_go_page":"Page" + "search_go_page":"Page", + "find_title":"Find \"{keyword}\" related {tablename} maybe {total}" } diff --git a/templates/explore/search_new.tmpl b/templates/explore/search_new.tmpl index 278d67099..0a227c3f6 100644 --- a/templates/explore/search_new.tmpl +++ b/templates/explore/search_new.tmpl @@ -52,9 +52,7 @@