From 2b0706cc75b22890c25877108f86bd2946df38c2 Mon Sep 17 00:00:00 2001 From: mka Date: Thu, 11 Jul 2013 11:49:36 +0000 Subject: [PATCH] Fix for updating the left menu of the "Search knowledge" screen. Labels are added. --- Workspace/Siman-Common/src/test/labels.properties | 2 ++ Workspace/Siman-Common/src/test/labels_en.properties | 2 ++ Workspace/Siman-WS/src/labels.properties | 2 ++ Workspace/Siman-WS/src/labels_en.properties | 2 ++ Workspace/Siman/WebContent/jsp/toolbar.jsp | 5 ++++- Workspace/Siman/src/labels.properties | 2 ++ Workspace/Siman/src/labels_en.properties | 2 ++ Workspace/Siman/src/org/splat/simer/MenuAction.java | 5 ++++- 8 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Workspace/Siman-Common/src/test/labels.properties b/Workspace/Siman-Common/src/test/labels.properties index e2970a8..2952cf8 100644 --- 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 c06256e..b1fe3c9 100644 --- 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 e2970a8..2952cf8 100644 --- 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 c06256e..b1fe3c9 100644 --- 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 e254301..94e920f 100644 --- a/Workspace/Siman/WebContent/jsp/toolbar.jsp +++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp @@ -6,7 +6,10 @@ configuration - + + search + search-knowledge + diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties index e2970a8..2952cf8 100644 --- 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 c06256e..b1fe3c9 100644 --- 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 6342b7b..58ff614 100644 --- 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; } -- 2.39.2