From: rkv <rkv@opencascade.com>
Date: Fri, 1 Feb 2013 11:37:44 +0000 (+0000)
Subject: Fix of "Config study" popup menu item.
X-Git-Tag: Root_Delivery2_2013_04_22~152
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1956b283b4865607f89f935340a51d3a0a23240f;p=tools%2Fsiman.git

Fix of "Config study" popup menu item.
---

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index 425381e..1228925 100644
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -34,12 +34,12 @@ import org.splat.dal.bo.som.Publication;
 import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.Study;
-import org.splat.dal.bo.som.Study.Properties;
 import org.splat.dal.bo.som.ValidationCycle;
-import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.bo.som.ValidationCycleRelation;
 import org.splat.dal.bo.som.ValidationStep;
 import org.splat.dal.bo.som.Visibility;
+import org.splat.dal.bo.som.Study.Properties;
+import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.dao.som.IDBuilderDAO;
 import org.splat.dal.dao.som.ScenarioDAO;
 import org.splat.dal.dao.som.StudyDAO;
@@ -409,6 +409,7 @@ public class StudyServiceImpl implements StudyService {
 	 *            a study to promote
 	 * @return true if the demotion succeeded.
 	 */
+	@Transactional
 	public boolean promote(final Study aStudy) {
 		if (aStudy.getProgressState() == ProgressState.inWORK) {
 			aStudy.setProgressState(ProgressState.inDRAFT);
diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
index 397dc82..8a437cf 100644
--- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
+++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
@@ -504,7 +504,7 @@ public class ApplicationSettings {
 			/* addItem(MNU_PROMOTE, new PopupItem("menu.archive")); */
 			addSeparator();
 			addItem(MNU_EDIT, new PopupItem("menu.properties").icon(
-					"icon.ed.png").action("../select?menu=properties"));
+					"icon.ed.png").action("../select?menu=configuration&item=prop-general"));
 			addSeparator();
 			addItem(MNU_SCRIPT, new PopupItem(MNU_NAME_SCRIPT)
 					.action("add-scenario"));