diff options
| author | donald.g.dunne | 2016-09-29 00:10:37 +0000 |
|---|---|---|
| committer | Donald Dunne | 2016-09-30 02:05:17 +0000 |
| commit | b6a2ec81a632fa77b81cfc912395b10a3aa3e929 (patch) | |
| tree | e2be1af598cbf6f4b66e3c8f55db5f59183a23d5 /plugins | |
| parent | 21f2491ae0c5c085c3121fb3f990df021f58bace (diff) | |
| download | org.eclipse.osee-b6a2ec81a632fa77b81cfc912395b10a3aa3e929.tar.gz org.eclipse.osee-b6a2ec81a632fa77b81cfc912395b10a3aa3e929.tar.xz org.eclipse.osee-b6a2ec81a632fa77b81cfc912395b10a3aa3e929.zip | |
bug: Fix Temporary Toggle AtsAdmin
Change-Id: I756ebb5e0a5313a51f5c43155e8899c8abc1613e
Diffstat (limited to 'plugins')
4 files changed, 14 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java index 49942e7e2ef..62affc57102 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java @@ -83,4 +83,8 @@ public enum AtsGroup { } return false; } + + public boolean isCurrentUserTemporaryOverride() { + return group.isCurrentUserTemporaryOverride(); + } } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java index c0b8e7a5411..a43e5ea76dc 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java @@ -114,7 +114,8 @@ public class AtsUtilClient { public static boolean isAtsAdmin(boolean useCache) { if (!useCache) { - atsAdmin = null; + atsAdmin = AtsGroup.AtsAdmin.isMember( + AtsClientService.get().getUserService().getCurrentUser()) || AtsGroup.AtsAdmin.isCurrentUserTemporaryOverride(); } return isAtsAdmin(); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java index db9a165eb1c..d6eb9aeede7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java @@ -123,4 +123,8 @@ public class OseeGroup { public String toString() { return "OseeGroup [groupName=" + token.getName() + "]"; } + + public boolean isCurrentUserTemporaryOverride() { + return isTemporaryOverride(UserManager.getUser()); + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java index 0bfc6df9d82..5cf3646a238 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java @@ -62,4 +62,8 @@ public enum SystemGroup { group.removeTemporaryOverride(); } + public boolean isCurrentUserTemporaryOverride() { + return group.isCurrentUserTemporaryOverride(); + } + } |