Changeset 550 for trunk/web2/addons/job_monarch/js/jobgrid.js

Timestamp:

07/14/08 14:31:03 (16 years ago)

Author:

ramonb

Message:

job_monarch/image.php:

• fix filter typos

job_monarch/js/jobgrid.js:

• fixed filter cell click enable/disable check
• reloading is now a function
• wil reload both grid and clusterimage now when filters are changed

job_monarch/jobstore.php:

• set memory limit
• respect host filter
• use fqdn setting for nodes

File:

• trunk/web2/addons/job_monarch/js/jobgrid.js (modified) (5 diffs)

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -94 +94 @@
   {
     delete myfilters['host'];
-  }
-
+    delete myparams['host'];
+  }
+
+  reloadClusterImage();
+  reloadJobStore();
+
+  return false;
+}
+
+function reloadJobStore()
+{
+  // Respect any other parameters that may have been set outside filters
+  //
+  myparams = joinMyArray( myparams, myfilters );
+
+  // Can't be sure if there are enough pages for new filter: reset to page 1
+  //
+  myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
+
+  JobsDataStore.reload( { params: myparams } );
+}
+
+function reloadClusterImage()
+{
   ClusterImageArgs['view'] = 'big-clusterimage';
 
@@ -102 +124 @@
 
   document.getElementById( 'clusterimage' ).src = './image.php?' + filt_url + '&' + imag_url;
-
-  return false;
 }
 
@@ -120 +140 @@
     if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
     {
-      if( !isset( myfilters[fieldName] ) )
+      if( inMyArrayKeys( myfilters, fieldName ) )
       {
         Ext.fly(cell).removeClass( 'filterenabled' );
@@ -130 +150 @@
         delete myparams[fieldName];
 
-        // Respect any other parameters that may have been set outside filters
-        //
-        myparams = joinMyArray( myparams, myfilters );
-
-        // Can't be sure if there are enough pages for new filter: reset to page 1
-        //
-        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
-
-        grid.getStore().reload( { params: myparams } );
+        reloadJobStore();
+        reloadClusterImage();
       }
       else
@@ -149 +162 @@
         myfilters[fieldName] = data;
 
-        myparams = joinMyArray( myparams, myfilters );
-        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
-
-        grid.getStore().reload( { params: myparams } );
+        reloadJobStore();
+        reloadClusterImage();
       }
     }