Fix for updating the left menu of the "Search knowledge" screen.

Labels are added.

diff --git a/Workspace/Siman-Common/src/test/labels.properties b/Workspace/Siman-Common/src/test/labels.properties
index e2970a8150fbf430d1814f1b756c7819b0684ba8..2952cf869f23a0fa6aea36236443b37731d0a80f 100644 (file)
--- a/Workspace/Siman-Common/src/test/labels.properties
+++ b/Workspace/Siman-Common/src/test/labels.properties
@@ -23,6 +23,7 @@ menu.newcontext       = Nouveau contexte
 menu.newcontype       = Nouveau type de contexte
 menu.newdoctype       = Nouveau type de document
 menu.accept           = Accepter les modifications
+menu.actualize        = Accepter les modifications
 menu.publish          = Publier
 menu.protect          = Protect
 menu.archive          = Archiver
@@ -281,6 +282,7 @@ message.noindex           = Aucune 
 message.nocontext         = Aucun contexte de simulation n''est en attente d''approbation.
 message.emptydocument     = Aucun document n''a été créé à cette étape.
 message.accept.document   = Voulez-vous accepter les modifications des documents utilisés ?
+message.actualize.document= Voulez-vous accepter les modifications des documents utilisés ?
 message.promote.study     = Voulez-vous avancer l’état de cette étude ?
 message.review.study      = Voulez-vous valider cette étude ?
 message.demote.study      = Voulez-vous reculer l’état de cette étude ?

diff --git a/Workspace/Siman-Common/src/test/labels_en.properties b/Workspace/Siman-Common/src/test/labels_en.properties
index c06256eab141dce0d8856c57c25a2dee6117628d..b1fe3c9a2685d4e1495012ab5e4a68c5dcd16d17 100644 (file)
--- a/Workspace/Siman-Common/src/test/labels_en.properties
+++ b/Workspace/Siman-Common/src/test/labels_en.properties
@@ -23,6 +23,7 @@ menu.newcontext       = New context
 menu.newcontype       = New context type
 menu.newdoctype       = New document type
 menu.accept           = Set up-to-date
+menu.actualize        = Set up-to-date
 menu.publish          = Publish
 menu.protect          = Protect
 menu.archive          = Archive
@@ -282,6 +283,7 @@ message.noindex           = All existing studies are already indexed.
 message.nocontext         = No simulation context is pending for approval.
 message.emptydocument     = No document has been created at this step.
 message.accept.document   = Do you really want to accept the modifications of dependent documents ?
+message.actualize.document= Do you really want to accept the modifications of dependent documents ?
 message.promote.study     = Do you really want to promote this study ?
 message.review.study      = Do you really want to validate this study ?
 message.demote.study      = Do you really want to demote this study ?

diff --git a/Workspace/Siman-WS/src/labels.properties b/Workspace/Siman-WS/src/labels.properties
index e2970a8150fbf430d1814f1b756c7819b0684ba8..2952cf869f23a0fa6aea36236443b37731d0a80f 100644 (file)
--- a/Workspace/Siman-WS/src/labels.properties
+++ b/Workspace/Siman-WS/src/labels.properties
@@ -23,6 +23,7 @@ menu.newcontext       = Nouveau contexte
 menu.newcontype       = Nouveau type de contexte
 menu.newdoctype       = Nouveau type de document
 menu.accept           = Accepter les modifications
+menu.actualize        = Accepter les modifications
 menu.publish          = Publier
 menu.protect          = Protect
 menu.archive          = Archiver
@@ -281,6 +282,7 @@ message.noindex           = Aucune 
 message.nocontext         = Aucun contexte de simulation n''est en attente d''approbation.
 message.emptydocument     = Aucun document n''a été créé à cette étape.
 message.accept.document   = Voulez-vous accepter les modifications des documents utilisés ?
+message.actualize.document= Voulez-vous accepter les modifications des documents utilisés ?
 message.promote.study     = Voulez-vous avancer l’état de cette étude ?
 message.review.study      = Voulez-vous valider cette étude ?
 message.demote.study      = Voulez-vous reculer l’état de cette étude ?

diff --git a/Workspace/Siman-WS/src/labels_en.properties b/Workspace/Siman-WS/src/labels_en.properties
index c06256eab141dce0d8856c57c25a2dee6117628d..b1fe3c9a2685d4e1495012ab5e4a68c5dcd16d17 100644 (file)
--- a/Workspace/Siman-WS/src/labels_en.properties
+++ b/Workspace/Siman-WS/src/labels_en.properties
@@ -23,6 +23,7 @@ menu.newcontext       = New context
 menu.newcontype       = New context type
 menu.newdoctype       = New document type
 menu.accept           = Set up-to-date
+menu.actualize        = Set up-to-date
 menu.publish          = Publish
 menu.protect          = Protect
 menu.archive          = Archive
@@ -282,6 +283,7 @@ message.noindex           = All existing studies are already indexed.
 message.nocontext         = No simulation context is pending for approval.
 message.emptydocument     = No document has been created at this step.
 message.accept.document   = Do you really want to accept the modifications of dependent documents ?
+message.actualize.document= Do you really want to accept the modifications of dependent documents ?
 message.promote.study     = Do you really want to promote this study ?
 message.review.study      = Do you really want to validate this study ?
 message.demote.study      = Do you really want to demote this study ?

diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp
index e2543014966c67030574d56c08099a2881a22fed..94e920f112f495d53a225d97b24f5ed1349b9d03 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/toolbar.jsp
+++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp
@@ -6,7 +6,10 @@
        <s:param name="menu">configuration</s:param>
 </s:url>
 <s:url id="scenario" namespace="/study" action="add-scenario"></s:url>
-<s:url id="idea" namespace="/study" action="search-knowledge"></s:url>
+<s:url id="idea" namespace="/" action="select">
+    <s:param name="menu">search</s:param>
+    <s:param name="item">search-knowledge</s:param>
+</s:url>
 <s:url id="back" namespace="/study" action="step-study"></s:url>
 
 <table width=100% border=0 cellspacing=0 cellpadding=0>

diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties
index e2970a8150fbf430d1814f1b756c7819b0684ba8..2952cf869f23a0fa6aea36236443b37731d0a80f 100644 (file)
--- a/Workspace/Siman/src/labels.properties
+++ b/Workspace/Siman/src/labels.properties
@@ -23,6 +23,7 @@ menu.newcontext       = Nouveau contexte
 menu.newcontype       = Nouveau type de contexte
 menu.newdoctype       = Nouveau type de document
 menu.accept           = Accepter les modifications
+menu.actualize        = Accepter les modifications
 menu.publish          = Publier
 menu.protect          = Protect
 menu.archive          = Archiver
@@ -281,6 +282,7 @@ message.noindex           = Aucune 
 message.nocontext         = Aucun contexte de simulation n''est en attente d''approbation.
 message.emptydocument     = Aucun document n''a été créé à cette étape.
 message.accept.document   = Voulez-vous accepter les modifications des documents utilisés ?
+message.actualize.document= Voulez-vous accepter les modifications des documents utilisés ?
 message.promote.study     = Voulez-vous avancer l’état de cette étude ?
 message.review.study      = Voulez-vous valider cette étude ?
 message.demote.study      = Voulez-vous reculer l’état de cette étude ?

diff --git a/Workspace/Siman/src/labels_en.properties b/Workspace/Siman/src/labels_en.properties
index c06256eab141dce0d8856c57c25a2dee6117628d..b1fe3c9a2685d4e1495012ab5e4a68c5dcd16d17 100644 (file)
--- a/Workspace/Siman/src/labels_en.properties
+++ b/Workspace/Siman/src/labels_en.properties
@@ -23,6 +23,7 @@ menu.newcontext       = New context
 menu.newcontype       = New context type
 menu.newdoctype       = New document type
 menu.accept           = Set up-to-date
+menu.actualize        = Set up-to-date
 menu.publish          = Publish
 menu.protect          = Protect
 menu.archive          = Archive
@@ -282,6 +283,7 @@ message.noindex           = All existing studies are already indexed.
 message.nocontext         = No simulation context is pending for approval.
 message.emptydocument     = No document has been created at this step.
 message.accept.document   = Do you really want to accept the modifications of dependent documents ?
+message.actualize.document= Do you really want to accept the modifications of dependent documents ?
 message.promote.study     = Do you really want to promote this study ?
 message.review.study      = Do you really want to validate this study ?
 message.demote.study      = Do you really want to demote this study ?

diff --git a/Workspace/Siman/src/org/splat/simer/MenuAction.java b/Workspace/Siman/src/org/splat/simer/MenuAction.java
index 6342b7be3979032dfc3f08d1e5bd8c3f69667277..58ff614acebb78929ae36a9bbaf00a4bdb5706ec 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/MenuAction.java
+++ b/Workspace/Siman/src/org/splat/simer/MenuAction.java
@@ -42,7 +42,10 @@ public class MenuAction extends Action {
                                }
                        }
                } else { // Selection of another menu item
-                       menu.selects(_item);
+                       getSession().put("menu.open", menu); // Activates the menu
+                       if (menu != null) {
+                               menu.selects(_item);
+                       }
                }
                return _item;
        }