JBPM-6881 : Rename Task Administration menu to Tasks (kiegroup#30)

nmirasch · Mar 9, 2018 · 6344b78 · 6344b78
1 parent 890a7ea
commit 6344b78
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 6 deletions.
diff --git a/...common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java b/...common-client/src/main/java/org/jbpm/workbench/common/client/menu/ManageSelectorImpl.java
@@ -70,7 +70,7 @@ public class ManageSelectorImpl implements ManageSelector {
         perspectives.put(PerspectiveIds.PROCESS_INSTANCES,
                          Constants.INSTANCE.Process_Instances());
         perspectives.put(PerspectiveIds.TASKS_ADMIN,
-                         Constants.INSTANCE.Tasks_Admin());
+                         Constants.INSTANCE.Tasks());
         perspectives.put(PerspectiveIds.EXECUTION_ERRORS,
                          Constants.INSTANCE.ExecutionErrors());
         perspectives.put(PerspectiveIds.JOBS,

diff --git a/...ommon-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java b/...ommon-client/src/main/java/org/jbpm/workbench/common/client/resources/i18n/Constants.java
@@ -112,7 +112,7 @@ String DataSetError(String dataSet,
 
     String Process_Instances();
 
-    String Tasks_Admin();
+    String Tasks();
 
     String Task_Inbox();
 

diff --git a/...t/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties b/...t/src/main/resources/org/jbpm/workbench/common/client/resources/i18n/Constants.properties
@@ -38,7 +38,7 @@ AdvancedFilters=Advanced Filters
 Process_Definitions=Process Definitions
 Process_Instances=Process Instances
 Task_Inbox=Task Inbox
-Tasks_Admin=Task Administration List
+Tasks=Tasks
 Jobs=Jobs
 ExecutionErrors=Execution Errors
 Manage=Manage

diff --git a/...man-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java b/...man-tasks-client/src/main/java/org/jbpm/workbench/ht/client/resources/i18n/Constants.java
@@ -31,6 +31,10 @@ public interface Constants extends Messages {
 
     Constants INSTANCE = GWT.create(Constants.class);
 
+    String Task_Inbox();
+
+    String Tasks();
+
     String Grid();
 
     String New_Task();

diff --git a/...lient/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties b/...lient/src/main/resources/org/jbpm/workbench/ht/client/resources/i18n/Constants.properties
@@ -1,3 +1,5 @@
+Task_Inbox=Task Inbox
+Tasks=Tasks
 Actual_Owner=Actual Owner
 Reminder_Details=Reminder Details
 Reminder=Reminder

diff --git a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/ShowcaseEntryPoint.java
@@ -42,7 +42,7 @@
 import org.uberfire.workbench.model.menu.MenuItem;
 import org.uberfire.workbench.model.menu.Menus;
 
-import static org.jbpm.workbench.common.client.PerspectiveIds.*;
+import static org.kie.workbench.common.workbench.client.PerspectiveIds.*;
 
 @EntryPoint
 @Bundle("i18n/HomeConstants.properties")
@@ -116,7 +116,7 @@ protected List<? extends MenuItem> getProcessManagementViews() {
                 MenuFactory.newSimpleItem(commonConstants.Process_Definitions()).perspective(PROCESS_DEFINITIONS).endMenu().build().getItems().get(0),
                 MenuFactory.newSimpleItem(commonConstants.Process_Instances()).perspective(PROCESS_INSTANCES).endMenu().build().getItems().get(0),
                 MenuFactory.newSimpleItem(constants.Process_Instances_Admin()).perspective(ProcessAdminSettingsPerspective.PERSPECTIVE_ID).endMenu().build().getItems().get(0),
-                MenuFactory.newSimpleItem(commonConstants.Tasks_Admin()).perspective(TASKS_ADMIN).endMenu().build().getItems().get(0),
+                MenuFactory.newSimpleItem(commonConstants.Tasks()).perspective(TASKS_ADMIN).endMenu().build().getItems().get(0),
                 MenuFactory.newSimpleItem(commonConstants.ExecutionErrors()).perspective(EXECUTION_ERRORS).endMenu().build().getItems().get(0)
         );
     }

diff --git a/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java b/jbpm-wb-showcase/src/main/java/org/jbpm/workbench/client/i18n/Constants.java
@@ -31,6 +31,10 @@ public interface Constants extends Messages {
 
     Constants INSTANCE = GWT.create(Constants.class);
 
+    String Task_Inbox();
+
+    String Tasks();
+
     String Tasks_List_Admin();
 
     String Dashboards();

diff --git a/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties b/jbpm-wb-showcase/src/main/resources/org/jbpm/workbench/client/i18n/Constants.properties
@@ -1,3 +1,5 @@
+Task_Inbox=Task Inbox
+Tasks=Task Administration
 Project_Authoring=Project Authoring
 Authoring=Authoring
 Process_Management=Process Management

diff --git a/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java b/jbpm-wb-showcase/src/test/java/org/jbpm/workbench/client/ShowcaseEntryPointTest.java
@@ -143,7 +143,7 @@ public void getProcessManagementViewsTest() {
                      processManagementMenuItems.get(1).getCaption());
         assertEquals(showcaseEntryPoint.constants.Process_Instances_Admin(),
                      processManagementMenuItems.get(2).getCaption());
-        assertEquals(showcaseEntryPoint.commonConstants.Tasks_Admin(),
+        assertEquals(showcaseEntryPoint.commonConstants.Tasks(),
                      processManagementMenuItems.get(3).getCaption());
         assertEquals(showcaseEntryPoint.commonConstants.ExecutionErrors(),
                      processManagementMenuItems.get(4).getCaption());