Skip to content

Commit

Permalink
updated search on user list page.
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Feb 26, 2014
1 parent d2cbb65 commit bb299c0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 56 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.properties
View file
Expand Up @@ -16,4 +16,4 @@

BasicSearchPanel.search=Search
BasicSearchPanel.clear=Clear search
BasicSearchPanel.textPlaceholder=Search name
BasicSearchPanel.textPlaceholder=Search text
1 change: 0 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties
View file
Expand Up @@ -19,7 +19,6 @@ pageBase.unknownBuildNumber=unknown
#most common used button names, used also in PageBase subclasses
PageBase.button.save=Save
PageBase.button.search=Search
PageBase.button.tooltip.clearSearch=Clear search
PageBase.button.back=Back
PageBase.button.cancel=Cancel
PageBase.button.saveAndRun=Save & Run
Expand Down
13 changes: 1 addition & 12 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
View file
Expand Up @@ -21,20 +21,9 @@
<div wicket:id="confirmDeletePopup" />

<form class="form-inline pull-right search-form" wicket:id="searchForm">
<div class="form-group">
<label class="sr-only"><wicket:message key="pageUsers.searchTextPlaceholder"/></label>
<input class="form-control input-sm" wicket:id="searchText"
wicket:message="placeholder:pageUsers.searchTextPlaceholder">
</div>

<select multiple="multiple" class="multiselect" wicket:id="searchType"/>

<span class="btn-group">
<a class="btn btn-default btn-sm" wicket:id="searchButton"/>
<a class="btn btn-danger btn-sm" wicket:id="searchClear" wicket:message="title:PageBase.button.tooltip.clearSearch">
<i class="fa fa-trash-o"/>
</a>
</span>
<div wicket:id="basicSearch"/>
</form>

<form wicket:id="mainForm" class="clearfix form-horizontal">
Expand Down
49 changes: 15 additions & 34 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
View file
Expand Up @@ -36,7 +36,7 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.AjaxSubmitButton;
import com.evolveum.midpoint.web.component.BasicSearchPanel;
import com.evolveum.midpoint.web.component.DropDownMultiChoice;
import com.evolveum.midpoint.web.component.data.ObjectDataProvider;
import com.evolveum.midpoint.web.component.data.TablePanel;
Expand All @@ -51,7 +51,6 @@
import com.evolveum.midpoint.web.page.admin.users.dto.UsersDto;
import com.evolveum.midpoint.web.session.UsersStorage;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
import com.evolveum.midpoint.web.util.SearchFormEnterBehavior;
import com.evolveum.midpoint.web.util.WebMiscUtil;
import com.evolveum.midpoint.xml.ns._public.common.common_2a.*;
import org.apache.commons.lang.StringUtils;
Expand All @@ -62,7 +61,6 @@
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
Expand Down Expand Up @@ -98,10 +96,8 @@ public class PageUsers extends PageAdminUsers {
private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_TABLE = "table";
private static final String ID_SEARCH_FORM = "searchForm";
private static final String ID_SEARCH_TEXT = "searchText";
private static final String ID_BASIC_SEARCH = "basicSearch";
private static final String ID_SEARCH_TYPE = "searchType";
private static final String ID_SEARCH_BUTTON = "searchButton";
private static final String ID_SEARCH_CLEAR = "searchClear";

private UserListItemDto singleDelete;
private LoadableModel<UsersDto> model;
Expand Down Expand Up @@ -186,7 +182,7 @@ public String getObject() {
}
});

IColumn column = new LinkColumn<UserListItemDto>(createStringResource("pageUsers.name"),
IColumn column = new LinkColumn<UserListItemDto>(createStringResource("ObjectType.name"),
UserType.F_NAME.getLocalPart(), UserListItemDto.F_NAME) {

@Override
Expand All @@ -196,19 +192,19 @@ public void onClick(AjaxRequestTarget target, IModel<UserListItemDto> rowModel)
};
columns.add(column);

column = new PropertyColumn(createStringResource("pageUsers.givenName"),
column = new PropertyColumn(createStringResource("UserType.givenName"),
UserType.F_GIVEN_NAME.getLocalPart(), UserListItemDto.F_GIVEN_NAME);
columns.add(column);

column = new PropertyColumn(createStringResource("pageUsers.familyName"),
column = new PropertyColumn(createStringResource("UserType.familyName"),
UserType.F_FAMILY_NAME.getLocalPart(), UserListItemDto.F_FAMILY_NAME);
columns.add(column);

column = new PropertyColumn(createStringResource("pageUsers.fullName"),
column = new PropertyColumn(createStringResource("UserType.fullName"),
UserType.F_FULL_NAME.getLocalPart(), UserListItemDto.F_FULL_NAME);
columns.add(column);

column = new PropertyColumn(createStringResource("pageUsers.email"), null, UserListItemDto.F_EMAIL);
column = new PropertyColumn(createStringResource("UserType.emailAddress"), null, UserListItemDto.F_EMAIL);
columns.add(column);

column = new PropertyColumn(createStringResource("pageUsers.accounts"), null, UserListItemDto.F_ACCOUNT_COUNT);
Expand Down Expand Up @@ -386,39 +382,24 @@ public String getIdValue(UsersDto.SearchType object, int index) {
}, options);
searchForm.add(searchType);

final AjaxSubmitButton searchButton = new AjaxSubmitButton(ID_SEARCH_BUTTON,
createStringResource("pageUsers.button.searchButton")) {
BasicSearchPanel<UsersDto> basicSearch = new BasicSearchPanel<UsersDto>(ID_BASIC_SEARCH, model) {

@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
searchPerformed(target);
protected IModel<String> createSearchTextModel() {
return new PropertyModel<String>(model, UsersDto.F_TEXT);
}

@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
target.add(getFeedbackPanel());
}
};
searchForm.add(searchButton);

final TextField searchText = new TextField(ID_SEARCH_TEXT, new PropertyModel<String>(model,
UsersDto.F_TEXT));
searchText.add(new SearchFormEnterBehavior(searchButton));
searchForm.add(searchText);

AjaxSubmitButton clearButton = new AjaxSubmitButton(ID_SEARCH_CLEAR) {

@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form){
clearSearchPerformed(target);
protected void searchPerformed(AjaxRequestTarget target) {
PageUsers.this.searchPerformed(target);
}

@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
target.add(getFeedbackPanel());
protected void clearSearchPerformed(AjaxRequestTarget target) {
PageUsers.this.clearSearchPerformed(target);
}
};
searchForm.add(clearButton);
searchForm.add(basicSearch);
}

private void userDetailsPerformed(AjaxRequestTarget target, String oid) {
Expand Down
8 changes: 0 additions & 8 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.properties
View file
Expand Up @@ -16,18 +16,10 @@

page.title=Users
page.subTitle=in midPoint
pageUsers.searchTextPlaceholder=Text
SearchType.NAME=Name
SearchType.GIVEN_NAME=Given name
SearchType.FAMILY_NAME=Family name
SearchType.FULL_NAME=Full name
pageUsers.name=Name
pageUsers.givenName=Given name
pageUsers.familyName=Family name
pageUsers.fullName=Full name
pageUsers.email=Email
pageUsers.search=Search text
pageUsers.button.searchButton=Search
pageUsers.message.queryError=Error occurred during translation search query to filter.
pageUsers.menu.reconcile=Reconcile
pageUsers.menu.delete=Delete
Expand Down
1 change: 1 addition & 0 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
View file
Expand Up @@ -193,6 +193,7 @@ FocusType.activation=Activation
UserType.fullName=Full name
UserType.givenName=Given name
UserType.familyName=Family name
UserType.emailAddress=Email
ReportType.export=Export
ReportType.useHibernateSession=Use hibernate session
ReportType.orientation=Orientation
Expand Down

0 comments on commit bb299c0

Please sign in to comment.