Skip to content

Commit

Permalink
Localization of search on DashboardSearchPanel
Browse files Browse the repository at this point in the history
  • Loading branch information
@PetrGasparik
PetrGasparik committed Dec 8, 2017
1 parent a70a981 commit 810a54c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 37 deletions.
1 change: 0 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
View file
Expand Up @@ -21,7 +21,6 @@
import com.evolveum.midpoint.web.security.MidPointApplication;
import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
import com.evolveum.midpoint.web.security.WebApplicationConfiguration;

import org.apache.commons.lang.StringUtils;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
View file
Expand Up @@ -140,7 +140,7 @@ protected void createBreadcrumb() {
}

private void initLayout(){
DashboardSearchPanel dashboardSearchPanel = new DashboardSearchPanel(ID_SEARCH_PANEL, null);
DashboardSearchPanel dashboardSearchPanel = new DashboardSearchPanel(ID_SEARCH_PANEL);
List<String> searchPanelActions = Arrays.asList(AuthorizationConstants.AUTZ_UI_USERS_ALL_URL,
AuthorizationConstants.AUTZ_UI_USERS_URL, AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL,
AuthorizationConstants.AUTZ_UI_RESOURCES_URL, AuthorizationConstants.AUTZ_UI_TASKS_ALL_URL,
Expand Down
60 changes: 26 additions & 34 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
View file
@@ -1,13 +1,12 @@
package com.evolveum.midpoint.web.page.self.component;

import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.web.component.util.SimplePanel;
import com.evolveum.midpoint.web.page.admin.resources.PageResources;
import com.evolveum.midpoint.web.page.admin.server.PageTasks;
import com.evolveum.midpoint.web.page.admin.users.PageUsers;
import com.evolveum.midpoint.web.page.admin.users.dto.UsersDto;

import org.apache.poi.ss.formula.functions.T;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
Expand All @@ -28,31 +27,31 @@
/**
* Created by honchar.
*/
public class DashboardSearchPanel extends SimplePanel<T> {

private static final String ID_SEARCH_INPUT = "searchInput";
private static final String ID_SEARCH_BUTTON = "searchButton";
private static final String ID_LINK_LABEL = "linkLabel";
private static final String ID_SEARCH_TYPE_ITEM = "searchTypeItem";
private static final String ID_SEARCH_TYPES = "searchTypes";
private static final String ID_BUTTON_LABEL = "buttonLabel";
private static final String ID_SEARCH_FORM = "searchForm";
private static final List<String> SEARCH_TYPES = Arrays.asList(new String[]{
"User", "Resource", "Task"});
private static final int USER_INDEX = 0;
private static final int RESOURCE_INDEX = 1;
private static final int TASK_INDEX = 2;
public class DashboardSearchPanel extends BasePanel<T> {

private final String ID_SEARCH_INPUT = "searchInput";
private final String ID_SEARCH_BUTTON = "searchButton";
private final String ID_SEARCH_TYPE_ITEM = "searchTypeItem";
private final String ID_SEARCH_TYPES = "searchTypes";
private final String ID_BUTTON_LABEL = "buttonLabel";
private final String ID_SEARCH_FORM = "searchForm";
private List<String> SEARCH_TYPES;
private final int USER_INDEX = 0;
private final int RESOURCE_INDEX = 1;
private final int TASK_INDEX = 2;
private int selectedSearchType = 0;

public DashboardSearchPanel(String id) {
this(id, null);
}

public DashboardSearchPanel(String id, IModel<T> model) {
super(id, model);
super(id);
SEARCH_TYPES = Arrays.asList(
createStringResource("PageDashboard.search.users").getString(),
createStringResource("PageDashboard.search.resources").getString(),
createStringResource("PageDashboard.search.tasks").getString()
);

initLayout();
}

@Override
protected void initLayout() {
final Form searchForm = new com.evolveum.midpoint.web.component.form.Form(ID_SEARCH_FORM);
add(searchForm);
Expand All @@ -78,7 +77,7 @@ protected void initLayout() {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
tag.put("placeholder", createStringResource("SearchPanel.searchByName").getString());
tag.put("placeholder", createStringResource("PageDashboard.search.input").getString());
}
};
searchForm.add(searchInput);
Expand All @@ -102,10 +101,6 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
searchForm.add(searchButton);
searchForm.setDefaultButton(searchButton);

// final WebMarkupContainer list = new WebMarkupContainer(ID_SEARCH_TYPES);
// list.setOutputMarkupId(true);


ListView<String> li = new ListView<String>(ID_SEARCH_TYPES, new IModel<List<String>>() {
@Override
public void detach() {
Expand All @@ -119,16 +114,16 @@ public List<String> getObject() {
@Override
public void setObject(List<String> list) {
}
})
{
}) {

@Override
protected void populateItem(final ListItem<String> item) {
@Override
protected void populateItem(final ListItem<String> item) {
final AjaxLink searchTypeLink = new AjaxLink(ID_SEARCH_TYPE_ITEM) {
@Override
public IModel<?> getBody() {
return new Model<String>(item.getModel().getObject());
}

@Override
public void onClick(AjaxRequestTarget target) {
selectedSearchType = accessibleSearchTypes.indexOf(item.getModelObject());
Expand Down Expand Up @@ -164,7 +159,4 @@ private void performSearch(String searchType, String text) {

}

protected IModel<String> createSearchTextModel() {
return (IModel) getModel();
}
}
1 change: 0 additions & 1 deletion ...c/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.properties
View file

This file was deleted.

0 comments on commit 810a54c

Please sign in to comment.