[rhmessaging-commits] rhmessaging commits: r3805 - mgmt/trunk/cumin/python/cumin/grid.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-01-18 13:39:06 -0500 (Mon, 18 Jan 2010)
New Revision: 3805

Modified:
   mgmt/trunk/cumin/python/cumin/grid/slot.py
   mgmt/trunk/cumin/python/cumin/grid/slot.strings
Log:
Remove jid from code and javascript.

Modified: mgmt/trunk/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/slot.py	2010-01-15 19:57:37 UTC (rev 3804)
+++ mgmt/trunk/cumin/python/cumin/grid/slot.py	2010-01-18 18:39:06 UTC (rev 3805)
@@ -373,7 +373,7 @@
                 return state
 
     class SlotInfo(ItemSet):
-        display_names = {"jid": "jid", "job_id": "Job ID",
+        display_names = {"job_id": "Job ID",
                          "system": "System", "machine": "Machine",
                          "state": "State", "activity": "Activity",
                          "name": "Name"}
@@ -432,11 +432,10 @@
             return item[1]
 
         def render_item_job_id(self, session, item):
-            #return item[0] == "jid" and "id='job_id'" or ""
             return item[0] == "Job ID" and "id='job_id'" or ""
 
         def render_item_row_class(self, session, item):
-            return item[0] == "jid" and "class='hidden_row'" or ""
+            return ""
 
 class SlotActivities(ItemSet):
     activities = (("Idle", "clear"),

Modified: mgmt/trunk/cumin/python/cumin/grid/slot.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/slot.strings	2010-01-15 19:57:37 UTC (rev 3804)
+++ mgmt/trunk/cumin/python/cumin/grid/slot.strings	2010-01-18 18:39:06 UTC (rev 3805)
@@ -641,20 +641,11 @@
         var for_jid = null;
         if (oInfo) {
             oInfo.style.display = "none";
-            if (oInfo.for_jid) {
-                for_jid = oInfo.for_jid;
-                oInfo.for_jid = null;
-            }
         }
         wooly.updatePage(xhtml);
         var oInfo = $(slot_info_id);
         if (oInfo) {
             oInfo.click_index = args.index;
-            oInfo.for_jid = null;
-            if (for_jid) {
-                clicks.doClick(for_jid.x, for_jid.y);
-                return;
-            }
 
             document.body.appendChild(oInfo); // so position is absolute to entire page
 
@@ -742,27 +733,10 @@
             var click_info = vis.get_index(x, y);
             var oInfo = $(slot_info_id);
             if (oInfo && click_info) {
-                if ((typeof oInfo.click_index != "undefined") &&
-                    (oInfo.click_index == click_info.index)) {
-                    // we already fetched the info for this slot
-                    var oInfoCell = document.getElementById("job_id");
-                    if (oInfoCell) {
-                        var jid = oInfoCell.innerHTML;
-                        if (jid != "") {
-                            go_to_job(jid);
-                            return false;
-                        }
-                    }
-                } else {
-                    // fetch the slot info so we can get the job id
-                    oInfo.for_jid = {fetching: true, x: x, y: y};
-                    vis.fire_slot_info(click_info.index);
-                }
+                // fetch the slot info so we can get the job id
+                oInfo.for_jid = {fetching: true, x: x, y: y};
+                vis.fire_slot_info(click_info.index);
             }
-            function go_to_job(jid) {
-                var url = show_slot_job_url.replace("XXX", jid+"");
-                window.location.href = url;
-            }
         }
     }