Changeset 563
- Timestamp:
- 01/22/09 16:33:31 (15 years ago)
- Location:
- trunk/web2/addons/job_monarch
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/image.php
r555 r563 57 57 $view = $httpvars->getHttpVar( "view" ); 58 58 $host = $httpvars->getHttpVar( "host" ); 59 $query = $httpvars->getHttpVar( "query" ); 59 60 $clustername = $httpvars->getClusterName(); 60 61 … … 64 65 if( isset($queue) && ($queue!='')) $filter[queue]=$queue; 65 66 if( isset($host) && ($host!='')) $filter[host]=$host; 67 if( isset($query) && ($query!='')) $filter[query]=$query; 66 68 //printf("host = %s\n", $filter[host] ); 67 69 … … 135 137 $ic->setFilter( 'host', $filtervalue); 136 138 break; 139 case "query": 140 $ic->setFilter( 'query', $filtervalue); 141 break; 137 142 default: 138 143 break; -
trunk/web2/addons/job_monarch/jobstore.php
r562 r563 110 110 { 111 111 $searchresults[$jobid] = $jobattrs; 112 } 113 if( is_array( $jobattrs['nodes'] ) ) 114 { 115 foreach( $jobattrs['nodes'] as $jattr ) 116 { 117 if( strpos( $jattr, $query ) !== false ) 118 { 119 $searchresults[$jobid] = $jobattrs; 120 } 121 } 122 } 123 if( strpos( $jobid, $query ) !== false ) 124 { 125 $searchresults[$jobid] = $jobattrs; 112 126 } 113 127 } -
trunk/web2/addons/job_monarch/js/jobgrid.js
r562 r563 336 336 method: 'POST' 337 337 }); 338 339 var SearchField; 338 340 339 341 JobsDataStore = new Ext.data.Store({ … … 361 363 ]), 362 364 sortInfo: { field: 'jid', direction: "DESC" }, 363 remoteSort: true 365 remoteSort: true, 366 listeners: { 'load': { 367 scope: this, 368 fn: function() { 369 if( SearchField ) { 370 search_value = SearchField.getEl().dom.value; 371 372 if( search_value != '' ) 373 { 374 myfilters['query'] = search_value; 375 } 376 377 reloadClusterImage(); 378 379 if( search_value != '' ) 380 { 381 delete myfilters['query']; 382 } 383 } 384 } 385 } 386 } 364 387 }); 365 388 … … 467 490 468 491 var win; 492 493 SearchField = new Ext.app.SearchField({ 494 store: JobsDataStore, 495 params: {start: 0, limit: mylimit}, 496 width: 200 497 }); 469 498 470 499 JobListingEditorGrid = new Ext.grid.EditorGridPanel({ … … 486 515 plugins: [new Ext.ux.PageSizePlugin()] 487 516 }), 488 tbar: [ new Ext.app.SearchField({ 489 store: JobsDataStore, 490 params: {start: 0, limit: mylimit}, 491 width: 200 492 }), 517 tbar: [ SearchField, 493 518 new Ext.Button({ 494 519 text: 'Show nodes', … … 511 536 } 512 537 } 513 }) 514 ] 538 }) ] 515 539 }); 516 540 -
trunk/web2/addons/job_monarch/libtoga.php
r562 r563 1363 1363 } 1364 1364 } 1365 if( $filtername == 'query' ) 1366 { 1367 foreach( $jobs[$myjob] as $myj_attr => $myj_val ) 1368 { 1369 if(!is_array( $myj_val ) ) 1370 { 1371 if( strpos( $myj_val, $filtervalue ) !== false ) 1372 { 1373 $addhost = 1; 1374 continue; 1375 } 1376 } 1377 else 1378 { 1379 foreach( $myj_val as $myj_v ) 1380 { 1381 if( strpos( $myj_v, $filtervalue ) !== false ) 1382 { 1383 $addhost = 1; 1384 continue; 1385 } 1386 } 1387 } 1388 if( strpos( $myjob, $filtervalue ) !== false ) 1389 { 1390 $addhost = 1; 1391 continue; 1392 } 1393 } 1394 } 1365 1395 } 1366 1396 }
Note: See TracChangeset
for help on using the changeset viewer.