Changeset 550 for trunk/web2/addons/job_monarch/js
- Timestamp:
- 07/14/08 14:31:03 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/js/jobgrid.js
r549 r550 94 94 { 95 95 delete myfilters['host']; 96 } 97 96 delete myparams['host']; 97 } 98 99 reloadClusterImage(); 100 reloadJobStore(); 101 102 return false; 103 } 104 105 function reloadJobStore() 106 { 107 // Respect any other parameters that may have been set outside filters 108 // 109 myparams = joinMyArray( myparams, myfilters ); 110 111 // Can't be sure if there are enough pages for new filter: reset to page 1 112 // 113 myparams = joinMyArray( myparams, { start: 0, limit: 30 } ); 114 115 JobsDataStore.reload( { params: myparams } ); 116 } 117 118 function reloadClusterImage() 119 { 98 120 ClusterImageArgs['view'] = 'big-clusterimage'; 99 121 … … 102 124 103 125 document.getElementById( 'clusterimage' ).src = './image.php?' + filt_url + '&' + imag_url; 104 105 return false;106 126 } 107 127 … … 120 140 if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' ) 121 141 { 122 if( !isset( myfilters[fieldName]) )142 if( inMyArrayKeys( myfilters, fieldName ) ) 123 143 { 124 144 Ext.fly(cell).removeClass( 'filterenabled' ); … … 130 150 delete myparams[fieldName]; 131 151 132 // Respect any other parameters that may have been set outside filters 133 // 134 myparams = joinMyArray( myparams, myfilters ); 135 136 // Can't be sure if there are enough pages for new filter: reset to page 1 137 // 138 myparams = joinMyArray( myparams, { start: 0, limit: 30 } ); 139 140 grid.getStore().reload( { params: myparams } ); 152 reloadJobStore(); 153 reloadClusterImage(); 141 154 } 142 155 else … … 149 162 myfilters[fieldName] = data; 150 163 151 myparams = joinMyArray( myparams, myfilters ); 152 myparams = joinMyArray( myparams, { start: 0, limit: 30 } ); 153 154 grid.getStore().reload( { params: myparams } ); 164 reloadJobStore(); 165 reloadClusterImage(); 155 166 } 156 167 }
Note: See TracChangeset
for help on using the changeset viewer.