mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix inconsistent search result in HTML export

Browse source 
The advanced search drop down menu always showed the user selected
settings, even if this is a customized search (tag, location) that took
place by clicking on the search quick hyperlink.

This is fixed by saving the user default search preferences and changing
them temporarily when quick hyperlinks searching is used.

Fixes #723

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2014-10-31 02:50:17 +02:00 • committed by Dirk Hohndel
parent 4e9aff047e
commit e3be473a7f
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
theme/dive_export.html
View file

@ -139,8 +139,40 @@ window.onload=function(){
getDefaultColor(); getDefaultColor();
} }
var user_search_preference = {
location : true,
divemaster : true,
buddy : true,
notes : true,
tags : true
};
function set_search_dropdown(search_preference)
{
console.log(search_preference);
searchingModules["location"].enabled = search_preference.location;
document.getElementById("search_item_location").checked = search_preference.location;
searchingModules["divemaster"].enabled = search_preference.divemaster;
document.getElementById("search_item_divemaster").checked = search_preference.divemaster;
searchingModules["buddy"].enabled = search_preference.buddy;
document.getElementById("search_item_Buddy").checked = search_preference.buddy;
searchingModules["notes"].enabled = search_preference.notes;
document.getElementById("search_item_Notes").checked = search_preference.notes;
searchingModules["tags"].enabled = search_preference.tags;
document.getElementById("search_item_Tags").checked = search_preference.tags;
}
function changeAdvSearch(e){ function changeAdvSearch(e){
searchingModules[e.value].enabled=e.checked; // change user searching preference
user_search_preference[e.value] = e.checked;
//set search preference dropdown
set_search_dropdown(user_search_preference);
SearchModules(document.getElementById("search_input").value, null); SearchModules(document.getElementById("search_input").value, null);
} }
@ -158,11 +190,11 @@ function changeAdvSearch(e){
<input id="search_input" oninput="SearchModules(this.value, null)" placeholder="search"/> <input id="search_input" oninput="SearchModules(this.value, null)" placeholder="search"/>
<a id="adv_srch_sp" onClick="showdiv()" >Advanced search</a> <a id="adv_srch_sp" onClick="showdiv()" >Advanced search</a>
<div id="advanced_search"> <div id="advanced_search">
<input type="checkbox" onchange="changeAdvSearch(this)" value="location" checked>Location<br> <input type="checkbox" onchange="changeAdvSearch(this)" id="search_item_location" value="location" checked>Location<br>
<input type="checkbox" onchange="changeAdvSearch(this)" value="divemaster" checked>Divemaster<br> <input type="checkbox" onchange="changeAdvSearch(this)" id="search_item_divemaster" value="divemaster" checked>Divemaster<br>
<input type="checkbox" onchange="changeAdvSearch(this)" value="buddy" checked>Buddy<br> <input type="checkbox" onchange="changeAdvSearch(this)" id="search_item_Buddy" value="buddy" checked>Buddy<br>
<input type="checkbox" onchange="changeAdvSearch(this)" value="notes" checked>Notes<br> <input type="checkbox" onchange="changeAdvSearch(this)" id="search_item_Notes" value="notes" checked>Notes<br>
<input type="checkbox" onchange="changeAdvSearch(this)" value="tags" checked>Tags<br> <input type="checkbox" onchange="changeAdvSearch(this)" id="search_item_Tags" value="tags" checked>Tags<br>
</div> </div>
<div id="toolbox"> <div id="toolbox">
<select id="no_dives_selector" onChange="setNumberOfDives(this)"> <select id="no_dives_selector" onChange="setNumberOfDives(this)">

2
theme/list_lib.js
View file

@ -516,6 +516,7 @@ function Node(value)
function Search_list_Modules(searchfor, searchOptions) function Search_list_Modules(searchfor, searchOptions)
{ {
document.getElementById("search_input").value = searchfor; document.getElementById("search_input").value = searchfor;
set_search_dropdown(searchOptions);
SearchModules(searchfor, searchOptions); SearchModules(searchfor, searchOptions);
} }
@ -531,6 +532,7 @@ function SearchModules(searchfor, searchOptions)
itemsToShow = olditemstoshow; itemsToShow = olditemstoshow;
list_sort(sort_based_on); list_sort(sort_based_on);
viewInPage(); viewInPage();
set_search_dropdown(user_search_preference);
return; return;
} }