yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-08-19 22:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the search keyword special characters and comments word break issue

Browse Source
This commit is contained in:
jbai 2016-04-21 16:25:08 -07:00
parent b254856a76
commit 7017db4406
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/controllers/api/v1/Search.java
View File

@ -38,12 +38,13 @@ public class Search extends Controller
return ok(result); return ok(result);
} }
public static Result searchByKeyword(String keyword) public static Result searchByKeyword()
{ {
ObjectNode result = Json.newObject(); ObjectNode result = Json.newObject();
int page = 1; int page = 1;
int size = 10; int size = 10;
String keyword = request().getQueryString("keyword");
String category = request().getQueryString("category"); String category = request().getQueryString("category");
String source = request().getQueryString("source"); String source = request().getQueryString("source");
String pageStr = request().getQueryString("page"); String pageStr = request().getQueryString("page");

2
web/app/views/index.scala.html
View File

@ -509,7 +509,7 @@
</a> </a>
</div> </div>
</div> </div>
<table class="tree table table-bordered"> <table class="tree table table-bordered" style="word-break: break-all;">
<tbody> <tbody>
<tr class="result"> <tr class="result">
<td class="span2" style="min-width:200px;">Dashboard Name</td> <td class="span2" style="min-width:200px;">Dashboard Name</td>

2
web/conf/routes
View File

@ -101,7 +101,7 @@ POST /api/v1/datasets/:id/own controllers.api.v1.Dataset.o
DELETE /api/v1/datasets/:id/own controllers.api.v1.Dataset.unownDataset(id:Int) DELETE /api/v1/datasets/:id/own controllers.api.v1.Dataset.unownDataset(id:Int)
GET /api/v1/search/:keyword controllers.api.v1.Search.searchByKeyword(keyword:String) GET /api/v1/search controllers.api.v1.Search.searchByKeyword()
GET /api/v1/metrics controllers.api.v1.Metric.getPagedMetrics() GET /api/v1/metrics controllers.api.v1.Metric.getPagedMetrics()

4
web/public/javascripts/routers/search.js
View File

@ -52,8 +52,8 @@ App.SearchRoute = Ember.Route.extend({
q = convertQueryStringToObject(); q = convertQueryStringToObject();
} }
var keyword = q.keywords; var keyword = atob(q.keywords);
var url = 'api/v1/search/' + keyword + '?page=' + params.page; var url = 'api/v1/search' + '?page=' + params.page + "&keyword=" + keyword;
if(q.category) { if(q.category) {
url += ("&category=" + q.category.toLowerCase()); url += ("&category=" + q.category.toLowerCase());
currentTab = q.category.toProperCase(); currentTab = q.category.toProperCase();

4
web/public/javascripts/search.js
View File

@ -95,7 +95,7 @@
if (inputObj) { if (inputObj) {
var keyword = inputObj.val(); var keyword = inputObj.val();
if (keyword) { if (keyword) {
window.location = '/#/search?keywords=' + keyword + window.location = '/#/search?keywords=' + btoa(keyword) +
'&category=Datasets&source=default&page=1'; '&category=Datasets&source=default&page=1';
} }
} }
@ -295,7 +295,7 @@
var keyword = inputObj.val(); var keyword = inputObj.val();
if (keyword) if (keyword)
{ {
window.location = '/#/search?keywords=' + keyword + window.location = '/#/search?keywords=' + btoa(keyword) +
'&category=Datasets&source=default&page=1'; '&category=Datasets&source=default&page=1';
} }
} }