Merge commit 'c177dd9afbd72f0424c72f6ea1b3e4e19b22b144' into HEAD

zanata · Sep 30, 2016 · 62b7891 · 62b7891
2 parents 9f030e5 + c177dd9
commit 62b7891
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
@@ -412,11 +412,11 @@ public void updatePersonRole(Long personId, char localeRoleInitial,
                 member.setCoordinator(isPermissionGranted);
             }
         }
-        savePermission(member, permissionDesc, isPermissionGranted);
+        savePermission(member, permissionDesc, role, isPermissionGranted);
     }
 
     private void savePermission(HLocaleMember member, String permissionDesc,
-            boolean isPermissionGranted) {
+            LocaleRole role, boolean isPermissionGranted) {
         languageTeamServiceImpl.joinOrUpdateRoleInLanguageTeam(
             language, member.getPerson().getId(),
             member.isTranslator(), member.isReviewer(), member.isCoordinator());
@@ -436,7 +436,18 @@ private void savePermission(HLocaleMember member, String permissionDesc,
         LanguageTeamPermissionChangedEvent changedEvent =
             new LanguageTeamPermissionChangedEvent(
                 member.getPerson(), getLocale().getLocaleId(),
-                doneByPerson).changedTranslatorPermission(member);
+                doneByPerson);
+        switch (role){
+            case Translator:
+                changedEvent = changedEvent.changedTranslatorPermission(member);
+                break;
+            case Reviewer:
+                changedEvent = changedEvent.changedReviewerPermission(member);
+                break;
+            case Coordinator:
+                changedEvent = changedEvent.changedCoordinatorPermission(member);
+                break;
+        }
         languageTeamPermissionChangedEvent.fire(changedEvent);
     }