Skip to content

C
check
Commit 39d308a7 by Masaru Abe
Options

検索結果のビューアで検索が効かない 

ホーム以外のビューアでインデックス一覧が表示出来ない
parent 7b2b1007
Showing with 13 additions and 4 deletions
abvw/bookmark.html
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
...@@ -50,6 +51,8 @@ ...@@ -50,6 +51,8 @@
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script>
......
abvw/contentsearch.html
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
...@@ -55,6 +56,8 @@ ...@@ -55,6 +56,8 @@
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script>
...@@ -128,7 +131,7 @@ ...@@ -128,7 +131,7 @@
<div class="tops"> <div class="tops">
<div id="main-searchresult"> <div id="main-searchresult">
<span class="lang" lang="txtSearchResult" id="txtSearchResult">検索結果</span> <span class="lang" lang="txtSearchResult" id="txtSearchResult">検索結果</span>
<input type="text" id="txtSearch" /> <input type="text" id="txtSearchWs" />
<input type="radio" id="main-content" name="main-searchtype" value="1" checked/><span id="main-search-content" class="lang" lang="txtCtnNm">コンテンツ名</span> <input type="radio" id="main-content" name="main-searchtype" value="1" checked/><span id="main-search-content" class="lang" lang="txtCtnNm">コンテンツ名</span>
<input type="radio" id="main-tag" name="main-searchtype" value="2" /><span id="main-search-tag" class="lang" lang="txtTag">タグ</span> <input type="radio" id="main-tag" name="main-searchtype" value="2" /><span id="main-search-tag" class="lang" lang="txtTag">タグ</span>
<input type="radio" id="main-body" name="main-searchtype" value="3" /><span id="main-search-body" class="lang" lang="txtContTxt">本文</span> <input type="radio" id="main-body" name="main-searchtype" value="3" /><span id="main-search-body" class="lang" lang="txtContTxt">本文</span>
......
abvw/history.html
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
...@@ -58,6 +59,8 @@ ...@@ -58,6 +59,8 @@
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script>
......
abvw/js/contentsearch.js
...@@ -90,7 +90,7 @@ $(document).ready(function(){ ...@@ -90,7 +90,7 @@ $(document).ready(function(){
$('#main-search').click(CONTENTSEARCH.searchEventButtonFunction); $('#main-search').click(CONTENTSEARCH.searchEventButtonFunction);
$('#txtSearch').keydown(CONTENTSEARCH.mainSearchKeyDownFunction); $('#txtSearchWs').keydown(CONTENTSEARCH.mainSearchKeyDownFunction);
$('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction); $('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction);
...@@ -173,7 +173,7 @@ CONTENTSEARCH.initialScreen = function(){ ...@@ -173,7 +173,7 @@ CONTENTSEARCH.initialScreen = function(){
var searchText = ClientData.searchCond_searchText(); var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision(); var searchDivision = ClientData.searchCond_searchDivision();
$('#txtSearch').val(searchText); $('#txtSearchWs').val(searchText);
//ClientData.searchCond_searchText(''); //ClientData.searchCond_searchText('');
if(searchDivision == 1){ if(searchDivision == 1){
...@@ -1123,7 +1123,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){ ...@@ -1123,7 +1123,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
var toPage = CONTENTSEARCH.returnNumberDispRecordForList(); var toPage = CONTENTSEARCH.returnNumberDispRecordForList();
var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE; var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE;
var sortOrder = CONTENTSEARCH.DEFAULT_SORT_ORDER; var sortOrder = CONTENTSEARCH.DEFAULT_SORT_ORDER;
var searchText = $('#txtSearch').val(); var searchText = $('#txtSearchWs').val();
var searchDivision; var searchDivision;
var content = $('#main-content').attr('checked'); var content = $('#main-content').attr('checked');
var tag = $('#main-tag').attr('checked'); var tag = $('#main-tag').attr('checked');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment