diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 5722628f..93c1bed0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -189,14 +189,7 @@ function fnTabMoveSch(collection){ fnFilterSch(); } function fnFilterSch(){ - if($("#query").val() != "" && $("#reQuery").val() != "") - { - if($("#filter_mylist").val().indexOf("search_query") == 0) - { - $("#filter_mylist").val($("#filter_mylist").val() + "search_query,"); - } - } - document.referencelistForm.action="/search/searchList.do"; + document.referencelistForm.action="/search/searchListCondition.do"; document.referencelistForm.submit(); } @@ -216,7 +209,7 @@ function fn_search_article(pageIndex) { -
+ diff --git a/src/main/webapp/js/search/util.js b/src/main/webapp/js/search/util.js index db1e0e57..668b659f 100644 --- a/src/main/webapp/js/search/util.js +++ b/src/main/webapp/js/search/util.js @@ -240,7 +240,6 @@ util = (function( w, $ ) { getBytes: getBytes, setEnterkeyEnabled: setEnterkeyEnabled, getPath: getPath, - downloadFile:downloadFile, updateFile:updateFile, clearFile:clearFile, deleteFile:deleteFile, @@ -253,7 +252,6 @@ util = (function( w, $ ) { setLocation:setLocation, nl2br:nl2br, isWindowSmall:isWindowSmall, - risDownloadFile:risDownloadFile, assetImgUrl:assetImgUrl, uploadImgUrl:uploadImgUrl, docView:docView,