redmine2998-part2.patch
| src/main/webapp/searchform.html (working copy) | ||
|---|---|---|
| 43 | 43 |
<input type="hidden" name="term6attribute" value="" /> |
| 44 | 44 |
|
| 45 | 45 |
|
| 46 |
<!-- Term7 place -->
|
|
| 46 |
<!-- Term7 place |
|
| 47 | 47 |
<input type="hidden" name="term7" /> |
| 48 |
<input type="hidden" name="term7attribute" value="" /> |
|
| 48 |
<input type="hidden" name="term7attribute" value="" /> -->
|
|
| 49 | 49 |
|
| 50 | 50 |
<!-- Term8 place --> |
| 51 | 51 |
<input type="hidden" name="term8" /> |
| src/main/webapp/scripts/default.js (working copy) | ||
|---|---|---|
| 64 | 64 |
var term6attribute = searchForm['term6attribute'].value = "datasource"; |
| 65 | 65 |
|
| 66 | 66 |
// Term7 place keyword |
| 67 |
var term7 = searchForm['term7'].value = dwr.util.getValue("placeKey");
|
|
| 68 |
var term7att = searchForm['term7attribute'].value = "placeKey"; |
|
| 67 |
// var term7 = searchForm['term7'].value = dwr.util.getValue("placeKey");
|
|
| 68 |
// var term7att = searchForm['term7attribute'].value = "placeKey";
|
|
| 69 | 69 |
|
| 70 | 70 |
// Term8 datetype keyword |
| 71 | 71 |
var term8 = searchForm['term8'].value = dwr.util.getValue("datetype");
|
| ... | ... | |
| 105 | 105 |
alert("You have not entered End date");
|
| 106 | 106 |
} |
| 107 | 107 |
var tempTerm3 = t3.replace(/,/g,""); |
| 108 |
if (t1.trim() == "" && t2.trim() == "" && tempTerm3.trim() == "" && t4.trim() == "" && t5.trim() == "" && term7.trim() =="") {
|
|
| 108 |
if (t1.trim() == "" && t2.trim() == "" && tempTerm3.trim() == "" && t4.trim() == "" && t5.trim() == "") {
|
|
| 109 | 109 |
alert("No query has been entered!");
|
| 110 | 110 |
} else {
|
| 111 | 111 |
msg = "SOLR - VARIABLES: Field Name(Type) = Value "; |
| ... | ... | |
| 157 | 157 |
var sources = dwr.util.getValue("sources");
|
| 158 | 158 |
var dateType = dwr.util.getValue("datetype");
|
| 159 | 159 |
var format = dwr.util.getValue("formats");
|
| 160 |
var placeString = dwr.util.getValue("placeKey");
|
|
| 160 |
var placeString = "";
|
|
| 161 | 161 |
//Simple ON |
| 162 | 162 |
if (simpleWord != "") {
|
| 163 | 163 |
var simpleOn = true; |
