Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Jun 22, 2017
2 parents fd6eaf1 + cde3d1d commit 816c581
Show file tree
Hide file tree
Showing 16 changed files with 611 additions and 205 deletions.
43 changes: 10 additions & 33 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
View file
Expand Up @@ -235,39 +235,16 @@ protected String getFilename() {
}

};

add(exportDataLink);

// CSVDataExporter csvDataExporter = new CSVDataExporter();
// final AbstractAjaxDownloadBehavior ajaxDownloadBehavior = new AbstractAjaxDownloadBehavior() {
// private static final long serialVersionUID = 1L;
//
// @Override
// public IResourceStream getResourceStream() {
// return new ExportToolbar.DataExportResourceStreamWriter(csvDataExporter, mainObjectListPanel.getTable().getDataTable());
// }
//
// public String getFileName() {
// return mainObjectListPanel.getType().getSimpleName() +
// "_" + mainObjectListPanel.createStringResource("MainObjectListPanel.exportFileName").getString();
// }
// };
//
// add(ajaxDownloadBehavior);
//
// AjaxIconButton exportDataLink = new AjaxIconButton(ID_EXPORT_DATA, new Model<>("fa fa-download"),
// mainObjectListPanel.createStringResource("MainObjectListPanel.export")) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// ajaxDownloadBehavior.initiate(target);
// }
// };
//
//
// add(exportDataLink);
exportDataLink.add(new VisibleEnableBehaviour(){
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible(){
return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_CSV_EXPORT_ACTION_URI);
}
});

add(exportDataLink);

}
}
Expand Down
16 changes: 15 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
View file
Expand Up @@ -33,6 +33,7 @@ public class SearchValue<T extends Serializable> implements DisplayableValue<T>,

private T value;
private String label;
private String displayName;

public SearchValue() {
this(null, null);
Expand All @@ -59,8 +60,13 @@ public T getValue() {

@Override
public String getLabel() {
if (label == null && value != null) {
if (label == null){
if (displayName != null) {
return displayName;
} else if (value != null){

return value.toString();
}
}

return label;
Expand All @@ -79,6 +85,14 @@ public void setValue(T value) {
setLabel(dv.getLabel());
}
}

public String getDisplayName() {
return displayName;
}

public void setDisplayName(String displayName) {
this.displayName = displayName;
}

@Override
public String toString() {
Expand Down
23 changes: 19 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
View file
Expand Up @@ -19,6 +19,7 @@
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.util.DisplayableValue;
import com.evolveum.midpoint.web.model.LookupPropertyModel;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -79,21 +80,35 @@ public void bind(Component component) {
}

private TextField initTextField() {
IModel data = new PropertyModel(getModel(), SearchValue.F_VALUE);
// IModel data = new PropertyModel(getModel(), SearchValue.F_VALUE);

if (lookup == null) {
return new TextField(ID_TEXT_INPUT, data);
return new TextField(ID_TEXT_INPUT, new PropertyModel(getModel(), SearchValue.F_VALUE));
}

LookupPropertyModel<String> lookupPropertyModel = new LookupPropertyModel<String>(getModel(), SearchValue.F_VALUE, lookup.asObjectable()) {

private static final long serialVersionUID = 1L;

@Override
public boolean isSupportsDisplayName() {
return true;
}
};

AutoCompleteSettings settings = new AutoCompleteSettings();
settings.setShowListOnEmptyInput(true);

return new AutoCompleteTextField(ID_TEXT_INPUT, data, settings) {
return new AutoCompleteTextField<String>(ID_TEXT_INPUT, lookupPropertyModel, settings) {

private static final long serialVersionUID = 1L;
@Override
protected Iterator getChoices(String input) {
protected Iterator<String> getChoices(String input) {
return prepareAutoCompleteList(input).iterator();
}



};
}

Expand Down
150 changes: 72 additions & 78 deletions ...rc/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
View file
Expand Up @@ -58,83 +58,71 @@ public RoleGovernanceRelationsPanel(String id, IModel<RoleType> model, List<Rela
}

@Override
protected List<InlineMenuItem> newMemberInlineMenuItems() {
List<InlineMenuItem> newMemberMenuItems = new ArrayList<>();

boolean isAuthorizedToCreate = WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_ADD_GOVERNANCE_ACTION_URI);
boolean isAuthorizedToAssign = WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_ASSIGN_GOVERNANCE_ACTION_URI);
if (isAuthorizedToCreate) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.createApprover"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.APPROVER.getRelation(), target);
}
}));
}

if (isAuthorizedToAssign) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.assignApprovers"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.APPROVER.getRelation(), target);
}
}));
}

if (isAuthorizedToCreate) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.createOwner"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.OWNER.getRelation(), target);
}
}));
}

if (isAuthorizedToAssign) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.assignOwners"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;
protected List<InlineMenuItem> createNewMemberInlineMenuItems() {
List<InlineMenuItem> createMemberMenuItems = new ArrayList<>();

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.OWNER.getRelation(), target);
}
}));
}
createMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.createApprover"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

if (isAuthorizedToCreate) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.createManager"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.APPROVER.getRelation(), target);
}
}));
createMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.createOwner"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.MANAGER.getRelation(), target);
}
}));
}
@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.OWNER.getRelation(), target);
}
}));
createMemberMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.createManager"),
false, new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

if (isAuthorizedToAssign) {
newMemberMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.addManagers"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
createFocusMemberPerformed(RelationTypes.MANAGER.getRelation(), target);
}
}));
return createMemberMenuItems;
}

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.MANAGER.getRelation(), target);
}
}));
}
return newMemberMenuItems;
@Override
protected List<InlineMenuItem> assignNewMemberInlineMenuItems() {
List<InlineMenuItem> assignMemberMenuItems = new ArrayList<>();

assignMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.assignApprovers"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.APPROVER.getRelation(), target);
}
}));
assignMemberMenuItems.add(new InlineMenuItem(createStringResource("roleMemberPanel.menu.assignOwners"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.OWNER.getRelation(), target);
}
}));
assignMemberMenuItems.add(new InlineMenuItem(createStringResource("TreeTablePanel.menu.addManagers"), false,
new HeaderMenuAction(this) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
addMembers(RelationTypes.MANAGER.getRelation(), target);
}
}));
return assignMemberMenuItems;
}

@Override
Expand All @@ -152,12 +140,18 @@ protected ObjectQuery createAllMemberQuery() {
}

@Override
protected List<InlineMenuItem> createUnassignMemberInlineMenuItems() {
List<InlineMenuItem> menuItems = new ArrayList<>();
if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_GOVERNANCE_ACTION_URI)){
menuItems.addAll(super.createUnassignMemberInlineMenuItems());
}
return menuItems;
protected boolean isAuthorizedToUnassignMembers(){
return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_GOVERNANCE_ACTION_URI);
}

@Override
protected boolean isAuthorizedToAssignMembers(){
return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_ASSIGN_GOVERNANCE_ACTION_URI);
}

@Override
protected boolean isAuthorizedToCreateMembers(){
return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_ADD_GOVERNANCE_ACTION_URI);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
View file
Expand Up @@ -41,7 +41,6 @@
import com.evolveum.midpoint.web.component.data.column.CheckBoxPanel;
import com.evolveum.midpoint.web.component.input.ObjectTypeChoiceRenderer;
import com.evolveum.midpoint.web.component.input.QNameChoiceRenderer;
import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.users.component.AbstractRoleMemberPanel;
Expand Down

0 comments on commit 816c581

Please sign in to comment.