Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2013-11-25 21:03:04 +0000
committerdonald.g.dunne2013-12-02 16:36:35 +0000
commit9aea9fb473cf52835ed0bbffd28d5e505133fd4b (patch)
tree1fd3a54fc5ecdee687422e5912c238f1899f6892 /plugins/org.eclipse.osee.ats/src
parentee0a9cc053fba7fb13a2c3125e9fbf289c4dd0d1 (diff)
downloadorg.eclipse.osee-9aea9fb473cf52835ed0bbffd28d5e505133fd4b.tar.gz
org.eclipse.osee-9aea9fb473cf52835ed0bbffd28d5e505133fd4b.tar.xz
org.eclipse.osee-9aea9fb473cf52835ed0bbffd28d5e505133fd4b.zip
feature[ats_75PG4]: Switch AtsUserService.isAtsAdmin to accept user
Diffstat (limited to 'plugins/org.eclipse.osee.ats/src')
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java13
2 files changed, 12 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java
index f817524dbce..568758fa05c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java
@@ -58,7 +58,8 @@ public class WorkflowManager {
// and access control writeable
awa.isAccessControlWrite() && //
- (WorkflowManagerCore.isEditable(awa, awa.getStateDefinition(), privilegedEditEnabled) || //
+ (WorkflowManagerCore.isEditable(AtsClientService.get().getUserAdmin().getCurrentUser(), awa,
+ awa.getStateDefinition(), privilegedEditEnabled) || //
// page is define to allow anyone to edit
awa.getStateDefinition().hasRule(RuleDefinitionOption.AllowAssigneeToAll.name()) ||
// awa is child of TeamWorkflow that has AllowAssigneeToAll rule
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
index 4f0def966b1..edd4a2ab31c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
@@ -84,7 +84,9 @@ public class SMAWorkFlowSection extends SectionPart {
this.sma = sma;
this.editor = editor;
- isEditable = WorkflowManagerCore.isEditable(sma, page.getStateDefinition(), editor.isPrivilegedEditModeEnabled());
+ isEditable =
+ WorkflowManagerCore.isEditable(AtsClientService.get().getUserAdmin().getCurrentUser(), sma,
+ page.getStateDefinition(), editor.isPrivilegedEditModeEnabled());
isGlobalEditable = !sma.isReadOnly() && sma.isAccessControlWrite() && editor.isPrivilegedEditModeEnabled();
isCurrentState = sma.isInState(page);
// parent.setBackground(Displays.getSystemColor(SWT.COLOR_CYAN));
@@ -425,8 +427,13 @@ public class SMAWorkFlowSection extends SectionPart {
// Notify extensions of widget modified
for (IAtsStateItem item : AtsStateItemManager.getStateItems()) {
try {
- item.widgetModified(xWidget, editor.getToolkit(), sma.getStateDefinition(), sma,
- WorkflowManagerCore.isEditable(sma, sma.getStateDefinition(), false));
+ item.widgetModified(
+ xWidget,
+ editor.getToolkit(),
+ sma.getStateDefinition(),
+ sma,
+ WorkflowManagerCore.isEditable(AtsClientService.get().getUserAdmin().getCurrentUser(), sma,
+ sma.getStateDefinition(), false));
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}

Back to the top