From 79f62a3b298efde72b99dd0dd990bf54c294fbe5 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Fri, 9 Oct 2009 19:57:56 +0000
Subject: [PATCH] svn merge -r18850:18860
https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
---
src/sview/block_info.c | 2 +-
src/sview/job_info.c | 8 --------
src/sview/node_info.c | 2 +-
src/sview/part_info.c | 2 +-
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index c9f252433ac..042dad60e0c 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -142,7 +142,7 @@ static display_data_t options_data_block[] = {
{G_TYPE_STRING, JOB_PAGE, "Jobs", TRUE, BLOCK_PAGE},
{G_TYPE_STRING, PART_PAGE, "Partition", TRUE, BLOCK_PAGE},
{G_TYPE_STRING, NODE_PAGE, "Base Partitions", TRUE, BLOCK_PAGE},
- {G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, BLOCK_PAGE},
+ //{G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, BLOCK_PAGE},
{G_TYPE_STRING, RESV_PAGE, "Reservation", TRUE, BLOCK_PAGE},
{G_TYPE_NONE, -1, NULL, FALSE, EDIT_NONE}
};
diff --git a/src/sview/job_info.c b/src/sview/job_info.c
index 2999919a868..e5a6524f28b 100644
--- a/src/sview/job_info.c
+++ b/src/sview/job_info.c
@@ -3131,14 +3131,6 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
snprintf(title, 100, "Block with job %d.%d",
jobid, stepid);
break;
- case SUBMIT_PAGE:
- if(stepid == NO_VAL)
- snprintf(title, 100, "Submit job on job %d", jobid);
- else
- snprintf(title, 100, "Submit job on job %d.%d",
- jobid, stepid);
-
- break;
case INFO_PAGE:
if(stepid == NO_VAL)
snprintf(title, 100, "Full info for job %d", jobid);
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index ab2bbb5d479..58328f29079 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -118,7 +118,7 @@ static display_data_t options_data_node[] = {
#endif
{G_TYPE_STRING, PART_PAGE, "Partition", TRUE, NODE_PAGE},
{G_TYPE_STRING, RESV_PAGE, "Reservation", TRUE, NODE_PAGE},
- {G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, NODE_PAGE},
+ //{G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, NODE_PAGE},
{G_TYPE_NONE, -1, NULL, FALSE, EDIT_NONE}
};
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index 91a70a70a92..78d852877ba 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -190,7 +190,7 @@ static display_data_t options_data_part[] = {
#else
{G_TYPE_STRING, NODE_PAGE, "Nodes", TRUE, PART_PAGE},
#endif
- {G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, PART_PAGE},
+ //{G_TYPE_STRING, SUBMIT_PAGE, "Job Submit", FALSE, PART_PAGE},
{G_TYPE_STRING, RESV_PAGE, "Reservations", TRUE, PART_PAGE},
{G_TYPE_NONE, -1, NULL, FALSE, EDIT_NONE}
};
--
GitLab