diff options
3 files changed, 9 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java index 206b9593570..90fba15db7d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkArtifactImageProvider.java @@ -32,6 +32,7 @@ public class FrameworkArtifactImageProvider extends ArtifactImageProvider { ArtifactImageManager.registerBaseImage(CoreArtifactTypes.User, FrameworkImage.USER, this); ArtifactImageManager.registerBaseImage(CoreArtifactTypes.GlobalPreferences, FrameworkImage.GEAR, this); ArtifactImageManager.registerBaseImage(CoreArtifactTypes.UserGroup, FrameworkImage.USERS, this); + ArtifactImageManager.registerBaseImage(CoreArtifactTypes.SubscriptionGroup, FrameworkImage.EMAIL, this); ArtifactImageManager.registerBaseImage(CoreArtifactTypes.UniversalGroup, FrameworkImage.GROUP, this); ArtifactImageManager.registerBaseImage(CoreArtifactTypes.ImplementationDetails, FrameworkImage.IMPLEMENTATION_DETAILS, this); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java index 3be4d796925..f99e9c40c99 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; +import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -84,8 +85,8 @@ public class PopulateUserGroupBlam extends AbstractBlam { super.widgetCreating(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable); if (xWidget.getLabel().equals("User Groups")) { XArtifactList listViewer = (XArtifactList) xWidget; - listViewer.setInputArtifacts(ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup, - BranchManager.getCommonBranch())); + listViewer.setInputArtifacts(ArtifactQuery.getArtifactListFromTypeWithInheritence(CoreArtifactTypes.UserGroup, + BranchManager.getCommonBranch(), DeletionFlag.EXCLUDE_DELETED)); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java index 8802160cf02..ec3e7d9e263 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java @@ -17,6 +17,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; +import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -51,8 +52,8 @@ public class EmailUserGroups extends XNavigateItemAction { public static Set<Artifact> getEmailGroupsAndUserGroups(User user) throws OseeCoreException { Set<Artifact> artifacts = new HashSet<Artifact>(); - for (Artifact art : ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup, - BranchManager.getCommonBranch())) { + for (Artifact art : ArtifactQuery.getArtifactListFromTypeWithInheritence(CoreArtifactTypes.UserGroup, + BranchManager.getCommonBranch(), DeletionFlag.EXCLUDE_DELETED)) { // Only add group if have read permissions if (!art.getName().equals("Root Artifact") && AccessControlManager.hasPermission(art, PermissionEnum.READ)) { artifacts.add(art); @@ -75,8 +76,8 @@ public class EmailUserGroups extends XNavigateItemAction { for (Artifact userArt : artifact.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) { if (userArt instanceof User) { if (!EmailUtil.isEmailValid((User) userArt)) { - OseeLog.logf(Activator.class, Level.SEVERE, - "Invalid email [%s] for user [%s]; skipping", ((User) userArt).getEmail(), userArt); + OseeLog.logf(Activator.class, Level.SEVERE, "Invalid email [%s] for user [%s]; skipping", + ((User) userArt).getEmail(), userArt); } else if (((User) userArt).isActive()) { emails.add(((User) userArt).getEmail()); } |