task_24166 #11
|
@ -38,7 +38,8 @@ public class ActionListPanel extends Composite {
|
||||||
private List<ActionDefinitionDV> listActionDefinition;
|
private List<ActionDefinitionDV> listActionDefinition;
|
||||||
private HandlerManager appManagerBus;
|
private HandlerManager appManagerBus;
|
||||||
|
|
||||||
public ActionListPanel(HandlerManager appManagerBus,String projectName, String profileID, List<ActionDefinitionDV> listActionDef) {
|
public ActionListPanel(HandlerManager appManagerBus, String projectName, String profileID,
|
||||||
|
List<ActionDefinitionDV> listActionDef) {
|
||||||
initWidget(uiBinder.createAndBindUi(this));
|
initWidget(uiBinder.createAndBindUi(this));
|
||||||
GWT.log("Adding list of actions: " + listActionDef);
|
GWT.log("Adding list of actions: " + listActionDef);
|
||||||
this.appManagerBus = appManagerBus;
|
this.appManagerBus = appManagerBus;
|
||||||
|
@ -60,7 +61,7 @@ public class ActionListPanel extends Composite {
|
||||||
private void initActions(List<ActionDefinitionDV> listActionDef) {
|
private void initActions(List<ActionDefinitionDV> listActionDef) {
|
||||||
|
|
||||||
if (listActionDef.size() > 0) {
|
if (listActionDef.size() > 0) {
|
||||||
//actionListBasePanel.setVisible(true);
|
// actionListBasePanel.setVisible(true);
|
||||||
|
|
||||||
ButtonGroup buttonGroup = new ButtonGroup();
|
ButtonGroup buttonGroup = new ButtonGroup();
|
||||||
buttonGroup.getElement().addClassName("actions-button-group");
|
buttonGroup.getElement().addClassName("actions-button-group");
|
||||||
|
@ -69,8 +70,9 @@ public class ActionListPanel extends Composite {
|
||||||
|
|
||||||
for (ActionDefinitionDV actionDefinitionDV : listActionDef) {
|
for (ActionDefinitionDV actionDefinitionDV : listActionDef) {
|
||||||
|
|
||||||
//skipping the special workflow action
|
// skipping the special workflow action
|
||||||
if(actionDefinitionDV.getId().equals(ConstantsGeoPortalDataEntryApp.WORKFLOW_ACTION_POST_CREATION_ACTION_ID)) {
|
if (actionDefinitionDV.getId()
|
||||||
|
.equals(ConstantsGeoPortalDataEntryApp.WORKFLOW_ACTION_POST_CREATION_ACTION_ID)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +85,8 @@ public class ActionListPanel extends Composite {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
|
|
||||||
appManagerBus.fireEvent(new WorkflowActionOnSelectedItemEvent<ResultDocumentDV>(actionDefinitionDV));
|
appManagerBus
|
||||||
|
.fireEvent(new WorkflowActionOnSelectedItemEvent<ResultDocumentDV>(actionDefinitionDV));
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -120,18 +123,22 @@ public class ActionListPanel extends Composite {
|
||||||
String itemPhase = ((ResultDocumentDV) item).getLifecycleInfo().getPhase();
|
String itemPhase = ((ResultDocumentDV) item).getLifecycleInfo().getPhase();
|
||||||
|
|
||||||
List<ActionDefButton> listButtons = mapPhaseListButtons.get(itemPhase);
|
List<ActionDefButton> listButtons = mapPhaseListButtons.get(itemPhase);
|
||||||
|
|
||||||
|
if (listButtons != null) {
|
||||||
|
|
||||||
for (ActionDefButton actionDefButton : listButtons) {
|
for (ActionDefButton actionDefButton : listButtons) {
|
||||||
|
|
||||||
Set<String> roles = actionDefButton.getActionDefinitionDV().getRoles();
|
Set<String> roles = actionDefButton.getActionDefinitionDV().getRoles();
|
||||||
|
|
||||||
//No role/s defined means enable the action by default
|
// No role/s defined means enable the action by default
|
||||||
if(roles.isEmpty()) {
|
if (roles.isEmpty()) {
|
||||||
actionDefButton.getButton().setVisible(true);
|
actionDefButton.getButton().setVisible(true);
|
||||||
actionListBasePanel.setVisible(true);
|
actionListBasePanel.setVisible(true);
|
||||||
}else {
|
} else {
|
||||||
//Checking if the userRole is matching the role defined in the ActionDefinition
|
// Checking if the userRole is matching the role defined in the ActionDefinition
|
||||||
boolean isRoleIntoActionDef= roles.stream().anyMatch(userRole.getName()::equalsIgnoreCase);
|
boolean isRoleIntoActionDef = roles.stream()
|
||||||
if(isRoleIntoActionDef) {
|
.anyMatch(userRole.getName()::equalsIgnoreCase);
|
||||||
|
if (isRoleIntoActionDef) {
|
||||||
actionDefButton.getButton().setVisible(true);
|
actionDefButton.getButton().setVisible(true);
|
||||||
actionListBasePanel.setVisible(true);
|
actionListBasePanel.setVisible(true);
|
||||||
}
|
}
|
||||||
|
@ -140,11 +147,16 @@ public class ActionListPanel extends Composite {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setAllActionsVisible(boolean bool) {
|
private void setAllActionsVisible(boolean bool) {
|
||||||
|
|
||||||
|
if (mapPhaseListButtons != null && mapPhaseListButtons.values().size() > 0) {
|
||||||
|
|
||||||
Iterator<List<ActionDefButton>> collIterator = mapPhaseListButtons.values().iterator();
|
Iterator<List<ActionDefButton>> collIterator = mapPhaseListButtons.values().iterator();
|
||||||
|
if (collIterator != null) {
|
||||||
while (collIterator.hasNext()) {
|
while (collIterator.hasNext()) {
|
||||||
List<ActionDefButton> listButton = collIterator.next();
|
List<ActionDefButton> listButton = collIterator.next();
|
||||||
for (ActionDefButton actionDefButton : listButton) {
|
for (ActionDefButton actionDefButton : listButton) {
|
||||||
|
@ -153,4 +165,6 @@ public class ActionListPanel extends Composite {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,6 +165,9 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
|
||||||
Object value = documentDV.getDocumentAsMap().get(key);
|
Object value = documentDV.getDocumentAsMap().get(key);
|
||||||
// GWT.log("key: "+key+" is instance of: "+value.getClass());
|
// GWT.log("key: "+key+" is instance of: "+value.getClass());
|
||||||
|
|
||||||
|
if(value==null)
|
||||||
|
return;
|
||||||
|
|
||||||
if (value instanceof ArrayList) {
|
if (value instanceof ArrayList) {
|
||||||
ArrayList<Object> arrayValues = (ArrayList<Object>) value;
|
ArrayList<Object> arrayValues = (ArrayList<Object>) value;
|
||||||
String toReturn = "<ul>";
|
String toReturn = "<ul>";
|
||||||
|
|
Loading…
Reference in New Issue