Skip to content

Commit e29219e

Browse files
SilverDavmmoqui
authored andcommitted
bug #14622: Message notifier is now well managed
1 parent a03fc26 commit e29219e

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ processManager.multipleWindowDetected = Le syst\u00e8me a d\u00e9tect\u00e9 que
114114
processManager.since = depuis le
115115
processManager.removeLock = Supprimer
116116
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n''appara\u00eet pas, vous pouvez <a href=''{0}''>rafra\u00eechir la liste</a>.
117-
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e.
117+
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e. <a href=''{0}''>Rafra\u00eechir la liste</a>
118118
processManager.replacements.manage = G\u00e9rer les remplacements
119119
processManager.replacements.none = Aucun remplacement
120120
processManager.replacements.mine.asIncumbent = Mes rempla\u00e7ants

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ processManager.since = since
115115
processManager.removeLock = Remove
116116

117117
processManager.createProcess.feedback=Your request has been registered. If it does not appear, you can <a href=''{0}''>refresh the list</a>.
118-
processManager.action.feedback=Your request has been processed.
118+
processManager.action.feedback=Your request has been processed. <a href=''{0}''>Refresh the list</a>
119119
processManager.replacements.manage = Manage replacements
120120
processManager.replacements.none = No replacement
121121
processManager.replacements.mine.asIncumbent = Replacements as incumbent

processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ processManager.since = depuis le
115115
processManager.removeLock = Supprimer
116116

117117
processManager.createProcess.feedback=Votre demande a bien \u00e9t\u00e9 enregistr\u00e9e. Si elle n''appara\u00eet pas, vous pouvez <a href=''{0}''>rafra\u00eechir la liste</a>.
118-
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e.
118+
processManager.action.feedback=Votre action a bien \u00e9t\u00e9 enregistr\u00e9e. <a href=''{0}''>Rafra\u00eechir la liste</a>
119119
processManager.replacements.manage = G\u00e9rer les remplacements
120120
processManager.replacements.none = Aucun remplacement
121121
processManager.replacements.mine.asIncumbent = Mes rempla\u00e7ants

processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,9 +1216,6 @@ private void setSubstituteToEvent(GenericEvent event) {
12161216
}
12171217
}
12181218

1219-
private void feedbackUser() {
1220-
feedbackUser("processManager.action.feedback", null);
1221-
}
12221219

12231220
private void feedbackUser(String key, String param) {
12241221
MessageNotifier.addSuccess(getMultilang().getString(key), param).setDisplayLiveTime(10000);
@@ -1382,7 +1379,8 @@ public void processAction(String stateName, String actionName, DataRecord data,
13821379
event.setResumingAction(this.isResumingInstance);
13831380
setSubstituteToEvent(event);
13841381
Workflow.getWorkflowEngine().process(event);
1385-
feedbackUser();
1382+
feedbackUser("processManager.action.feedback",
1383+
URLUtil.getSimpleURL(URLUtil.URL_COMPONENT, getComponentId()));
13861384
}
13871385
} catch (WorkflowException e) {
13881386
throw new ProcessManagerException("Fail to process action " + actionName, e);

0 commit comments

Comments
 (0)