x/stacktach
Code Issues Proposed changes

Include Updates checkbox on Commands search

Browse Source
This commit is contained in:
Andrew Melton
2013-04-10 13:43:13 -04:00
parent 1bc6dac659
commit 47b3cc0349
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stacktach/views.py
View File

@@ -462,13 +462,20 @@ def search(request, deployment_id):
c = _default_context(request, deployment_id) c = _default_context(request, deployment_id)
column = request.POST.get('field', None) column = request.POST.get('field', None)
value = request.POST.get('value', None) value = request.POST.get('value', None)
updates = request.POST.get('updates', True)
if updates and updates == 'true':
updates = True
elif updates and updates == 'false':
updates = False
rows = None rows = None
if column != None and value != None: if column != None and value != None:
rows = models.RawData.objects.select_related() rows = models.RawData.objects.select_related()
if deployment_id: if deployment_id and int(deployment_id) != 0:
row = rows.filter(deployment=deployment_id) rows = rows.filter(deployment=deployment_id)
rows = rows.filter(**{column:value}). \ rows = rows.filter(**{column: value})
order_by('-when')[:22] if not updates:
rows = rows.exclude(event='compute.instance.update')
rows = rows.order_by('-when')[:22]
_post_process_raw_data(rows) _post_process_raw_data(rows)
c['rows'] = rows c['rows'] = rows
c['allow_expansion'] = True c['allow_expansion'] = True

4
templates/index.html
View File

@@ -17,7 +17,8 @@ function search_form(deployment_id)
{ {
var field = $("#field").val(); var field = $("#field").val();
var value = $("#query").val(); var value = $("#query").val();
var data = {'field':field, 'value':value}; var updates = $("#updates").is(":checked")
var data = {'field':field, 'value':value, 'updates':updates};
$("#detail").load('/' + deployment_id + '/search/', data); $("#detail").load('/' + deployment_id + '/search/', data);
return false; return false;
}; };
@@ -54,6 +55,7 @@ function search_form(deployment_id)
<option selected='true'>instance <option selected='true'>instance
</select> </select>
<input type='text' id='query' size='60' value=''/> <input type='text' id='query' size='60' value=''/>
Include Updates: <input type='checkbox' id="updates" checked />
<input type='submit' value='Search' onclick='return search_form({{deployment_id}});'/> <input type='submit' value='Search' onclick='return search_form({{deployment_id}});'/>
</form> </form>
</div> </div>