From: barate <barate>
Date: Wed, 28 Mar 2012 16:06:45 +0000 (+0000)
Subject: Merge from BR_VISHNU
X-Git-Tag: V6_5_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=94e81a1804796e1aa630bbe904ecf0a40c63ed49;p=modules%2Fjobmanager.git

Merge from BR_VISHNU
---

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index 19b29bb..93f26ad 100644
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -141,6 +141,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _batch_line->addItem("ccc");
   _batch_line->addItem("slurm");
   _batch_line->addItem("ll");
+  _batch_line->addItem("vishnu");
   _batch_line->setCurrentIndex(-1);
 
   QLabel * mpiImpl_label = new QLabel("MPI impl:");
@@ -252,6 +253,8 @@ JM::EditSalomeResource::get_infos()
     _batch_line->setCurrentIndex(5);
   else if (batch == "ll")
     _batch_line->setCurrentIndex(6);
+  else if (batch == "vishnu")
+    _batch_line->setCurrentIndex(7);
   else
     _batch_line->setCurrentIndex(-1);