- BZ-986819 and BZ-986825 fixes in kie-drools-wb and kie-wb

kiegroup · Jul 23, 2013 · 0218746 · 0218746
1 parent 21f8592
commit 0218746
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 18 deletions.
diff --git a/...wb-webapp/src/main/java/org/kie/workbench/drools/client/KieDroolsWorkbenchEntryPoint.java b/...wb-webapp/src/main/java/org/kie/workbench/drools/client/KieDroolsWorkbenchEntryPoint.java
@@ -46,6 +46,8 @@
 import org.uberfire.client.workbench.widgets.menu.WorkbenchMenuBarPresenter;
 import org.uberfire.mvp.Command;
 import org.uberfire.mvp.impl.DefaultPlaceRequest;
+import org.uberfire.security.Identity;
+import org.uberfire.security.Role;
 import org.uberfire.workbench.model.menu.MenuFactory;
 import org.uberfire.workbench.model.menu.MenuItem;
 import org.uberfire.workbench.model.menu.MenuPosition;
@@ -73,6 +75,9 @@ public class KieDroolsWorkbenchEntryPoint {
 
     @Inject
     private ActivityManager activityManager;
+
+    @Inject
+    private Identity identity;
 
     @AfterInitialization
     public void startApp() {
@@ -112,14 +117,6 @@ public void execute() {
                 .newTopLevelMenu( constants.deployment() )
                 .withItems( getDeploymentMenuItems() )
                 .endMenu()
-                .newTopLevelMenu( constants.logout() )
-                .respondsWith( new Command() {
-                    @Override
-                    public void execute() {
-                        redirect( GWT.getModuleBaseURL() + "uf_logout" );
-                    }
-                } )
-                .endMenu()
                 .newTopLevelMenu( constants.find() )
                 .position( MenuPosition.RIGHT )
                 .respondsWith( new Command() {
@@ -129,10 +126,31 @@ public void execute() {
                     }
                 } )
                 .endMenu()
+                .newTopLevelMenu( constants.User() +": "+ identity.getName() )
+                .position( MenuPosition.RIGHT )
+                .withItems( getRoles() )
+                .endMenu()
                 .build();
 
         menubar.addMenus( menus );
     }
+
+     private List<? extends MenuItem> getRoles() {
+        final List<MenuItem> result = new ArrayList<MenuItem>( identity.getRoles().size() );
+        for ( final Role role : identity.getRoles() ) {
+            if(!role.getName().equals("IS_REMEMBER_ME")){
+                result.add( MenuFactory.newSimpleItem( constants.Role() +": " + role.getName() ).endMenu().build().getItems().get( 0 ) );
+            }
+        }
+        result.add(MenuFactory.newSimpleItem(constants.LogOut()).respondsWith(new Command() {
+                    @Override
+                    public void execute() {
+                        redirect(GWT.getModuleBaseURL() + "uf_logout");
+                    }
+                }).endMenu().build().getItems().get(0));
+
+        return result;
+    }
 
     private List<MenuItem> getAuthoringMenuItems() {
         final List<MenuItem> result = new ArrayList<MenuItem>( 1 );

diff --git a/...-wb-webapp/src/main/java/org/kie/workbench/drools/client/resources/i18n/AppConstants.java b/...-wb-webapp/src/main/java/org/kie/workbench/drools/client/resources/i18n/AppConstants.java
@@ -86,4 +86,10 @@ public interface AppConstants
 
     String homeDeployCaption();
 
+    String Role();
+
+    String User();
+
+    String LogOut();
+
 }
diff --git a/...src/main/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants.properties b/...src/main/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants.properties
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_es_ES.properties b/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_es_ES.properties
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_fr_FR.properties b/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_fr_FR.properties
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_ja_JP.properties b/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_ja_JP.properties
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_pt_BR.properties b/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_pt_BR.properties
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_zh_CN.properties b/...in/resources/org/kie/workbench/drools/client/resources/i18n/AppConstants_zh_CN.properties
@@ -1,4 +1,4 @@
-home=Home
+\u00ef\u00bb\u00bfhome=Home
 authoring=Authoring
 project_authoring=Projects
 administration=Administration
@@ -24,3 +24,6 @@ homeAuthor=Author
 homeAuthorCaption=Formalize your Business Knowledge
 homeDeploy=Deploy
 homeDeployCaption=Learn how to configure your environment
+Role=Role
+User=User
+LogOut=Log Out
diff --git a/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/client/KieWorkbenchEntryPoint.java b/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/client/KieWorkbenchEntryPoint.java
@@ -133,12 +133,7 @@ public void execute() {
                 .newTopLevelMenu(constants.Deploy()).withItems(getDeploymentViews()).endMenu()
                 .newTopLevelMenu(constants.Process_Management()).withItems(getProcessMGMTViews()).endMenu()
                 .newTopLevelMenu(constants.Tasks()).withItems(getTasksViews()).endMenu().newTopLevelMenu(constants.Dashboards())
-                .withItems(getDashboardViews()).endMenu().newTopLevelMenu(constants.LogOut()).respondsWith(new Command() {
-                    @Override
-                    public void execute() {
-                        redirect(GWT.getModuleBaseURL() + "uf_logout");
-                    }
-                }).endMenu()
+                .withItems(getDashboardViews()).endMenu()
                 .newTopLevelMenu(constants.find())
                 .position( MenuPosition.RIGHT )
                 .respondsWith( new Command() {
@@ -148,7 +143,7 @@ public void execute() {
                     }
                 } )
                 .endMenu()
-                .newTopLevelMenu( identity.getName() )
+                .newTopLevelMenu( constants.User() +": "+ identity.getName() )
                 .position( MenuPosition.RIGHT )
                 .withItems( getRoles() )
                 .endMenu()
@@ -160,8 +155,16 @@ public void execute() {
     private List<? extends MenuItem> getRoles() {
         final List<MenuItem> result = new ArrayList<MenuItem>( identity.getRoles().size() );
         for ( final Role role : identity.getRoles() ) {
-            result.add( MenuFactory.newSimpleItem( role.getName() ).endMenu().build().getItems().get( 0 ) );
+            if(!role.getName().equals("IS_REMEMBER_ME")){
+                result.add( MenuFactory.newSimpleItem( constants.Role() +": " + role.getName() ).endMenu().build().getItems().get( 0 ) );
+            }
         }
+        result.add(MenuFactory.newSimpleItem(constants.LogOut()).respondsWith(new Command() {
+                    @Override
+                    public void execute() {
+                        redirect(GWT.getModuleBaseURL() + "uf_logout");
+                    }
+                }).endMenu().build().getItems().get(0));
 
         return result;
     }

diff --git a/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/client/resources/i18n/AppConstants.java b/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/client/resources/i18n/AppConstants.java
@@ -116,4 +116,8 @@ public interface AppConstants
 
     String homeImproveCaption();
 
+    String User();
+
+    String Role();
+
 }
diff --git a/...webapp/src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants.properties b/...webapp/src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants.properties
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=User
+Role=Role
diff --git a/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_es_ES.properties b/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_es_ES.properties
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=Usuario
+Role=Rol
diff --git a/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_fr_FR.properties b/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_fr_FR.properties
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=User
+Role=Role
diff --git a/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_ja_JP.properties b/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_ja_JP.properties
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=User
+Role=Role
diff --git a/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_pt_BR.properties b/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_pt_BR.properties
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=User
+Role=Role
diff --git a/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_zh_CN.properties b/.../src/main/resources/org/kie/workbench/client/resources/i18n/AppConstants_zh_CN.properties
@@ -1,4 +1,4 @@
-Tasks_List=Tasks List
+\u00ef\u00bb\u00bfTasks_List=Tasks List
 Process_Dashboard=Process & Task Dashboard
 Business_Dashboard=Business Dashboards
 Project_Authoring=Project Authoring
@@ -39,3 +39,5 @@ homeWork=Work
 homeWorkCaption=Reduce the paper work
 homeImprove=Improve
 homeImproveCaption=Your Business Performance
+User=User
+Role=Role