Differential D281

search fix
ClosedPublic
Actions

Authored by lbrabec on Feb 19 2015, 2:40 PM.

Details

Reviewers
jskladan
Maniphest Tasks
T402: ResultsDB search yields HTTP 404
Commits
rRSFEe1f37b945c42: Search fix
Summary

Fix for bad search url.

Test Plan

run the frontend and try to search

Diff Detail

Repository
rRSFE resultsdb_frontend
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
lbrabec retitled this revision from to search fix.Feb 19 2015, 2:40 PM
lbrabec updated this object.
lbrabec edited the test plan for this revision. (Show Details)
lbrabec added a reviewer: jskladan.
jskladan requested changes to this revision.Feb 19 2015, 2:56 PM

Good for me as a quick fix, but I suppose that it won't work from http://.../resultsdb_frontend/results/xyz/ and such. Try and solve it by storing the 'root' url of the /results somewhere where the javascript can access it (the form?), and populate the root url with url_for.

This revision now requires changes to proceed.Feb 19 2015, 2:56 PM
lbrabec updated this revision to Diff 775.Feb 19 2015, 3:05 PM
  • search fix, polished
jskladan accepted this revision.Feb 19 2015, 4:00 PM
This revision is now accepted and ready to land.Feb 19 2015, 4:00 PM
Closed by commit rRSFEe1f37b945c42: Search fix (authored by Lukas Brabec <lbrabec@redhat.com>). · Explain WhyFeb 19 2015, 7:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 776

View Options

resultsdb_frontend/static/js/search.js

Show All 39 Lines29$(function() {
40 } 40​ }
41 ).on('click', function(){ 41​ ).on('click', function(){
42 $(".popover #query").focus(); 42​ $(".popover #query").focus();
43 $(".popover #searchform").submit(function(e){ 43​ $(".popover #searchform").submit(function(e){
44 44​
45 var query = $(".popover #query").val(); 45​ var query = $(".popover #query").val();
46 var testcase = $(".popover #testcase").val(); 46​ var testcase = $(".popover #testcase").val();
47 var type = $(".popover #type").val(); 47​ var type = $(".popover #type").val();
48 48​ var url = $(".popover #url").val() + "?"
49 var url = "/results?" ​
50 49​
51 if(query != "") 50​ if(query != "")
52 if($(".popover #exact").prop('checked')) 51​ if($(".popover #exact").prop('checked'))
53 url += "item="+query; 52​ url += "item="+query;
54 else 53​ else
55 url += "item:like="+query+"%"; 54​ url += "item:like="+query+"%";
56 55​
57 if(testcase != 0) 56​ if(testcase != 0)
Show All 22 Lines
View Options

resultsdb_frontend/templates/layout.html

Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s)11 <body>
71 <!-- Search logic --> 71​ <!-- Search logic -->
72 <script src="{{ url_for('static', filename='js/search.js') }}"></script> 72​ <script src="{{ url_for('static', filename='js/search.js') }}"></script>
73 73​
74 <!-- Search html --> 74​ <!-- Search html -->
75 <div id="popover-head" class="hide">Search</div> 75​ <div id="popover-head" class="hide">Search</div>
76 <div id="popover-content" class="hide"> 76​ <div id="popover-content" class="hide">
77 77​
78 <form id="searchform" role="form" name="searchform" action=""> 78​ <form id="searchform" role="form" name="searchform" action="">
79​ <input id="url" type="hidden" value="{{ url_for('main.results') }}">
79 <div class="form-group"> 80​ <div class="form-group">
80 <input class="form-control" id="query" placeholder="Search" value=""> 81​ <input class="form-control" id="query" placeholder="Search" value="">
81 </div> 82​ </div>
82 83​
83 <div class="form-group"> 84​ <div class="form-group">
84 <select class="form-control" id="testcase"> 85​ <select class="form-control" id="testcase">
85 <option value="0">Any testcase</option> 86​ <option value="0">Any testcase</option>
86 <option value="rpmlint">Rpmlint</option> 87​ <option value="rpmlint">Rpmlint</option>
Show All 25 Lines