Skip to content

Commit

Permalink
MID-2252 user search page, work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Aug 11, 2015
1 parent 6c0efe1 commit a2d7d15
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 7 deletions.
7 changes: 2 additions & 5 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
View file
Expand Up @@ -43,10 +43,7 @@
import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
import com.evolveum.midpoint.web.page.admin.server.PageTaskAdd;
import com.evolveum.midpoint.web.page.admin.server.PageTasks;
import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
import com.evolveum.midpoint.web.page.admin.users.PageUser;
import com.evolveum.midpoint.web.page.admin.users.PageUsers;
import com.evolveum.midpoint.web.page.admin.users.*;
import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstancesAll;
import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstancesRequestedBy;
import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstancesRequestedFor;
Expand Down Expand Up @@ -265,7 +262,7 @@ private MenuBarItem createHomeItems() {
private MenuBarItem createUsersItems() {
MenuBarItem users = new MenuBarItem(createStringResource("PageAdmin.menu.top.users"), null);
users.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.users.list"), PageUsers.class));
// users.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.users.find"), PageFindUsers.class));
users.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.users.find"), PageFindUsers.class));
users.addMenuItem(new MenuItem(createStringResource("PageAdmin.menu.top.users.new"), PageUser.class));

MenuItem orgTree = new MenuItem(createStringResource("PageAdmin.menu.top.users.org.tree"), PageOrgTree.class);
Expand Down
76 changes: 76 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.html
View file
Expand Up @@ -18,7 +18,83 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<form wicket:id="form" class="clearfix form-horizontal">
<div wicket:id="table"/>

<div class="row">
<div class="col-md-offset-1 col-md-10 col-xs-12">
<table class="table table-condensed table-striped">
<thead>
<tr>
<th style="width: 30px;"></th>
<th>Property</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<tr>
<td><input type="checkbox"/></td>
<td>
<select class="form-control input-sm">
<option>Name</option>
<option>Given name</option>
<option>Family name</option>
<option>every property</option>
</select>
</td>
<td>
<div class="input-group">
<input type="text" class="form-control input-sm"/>
<div class="input-group-btn">
<button class="btn btn-sm btn-danger" type="button">
<i class="fa fa-minus"> </i>
</button>
<button class="btn btn-sm btn-success" type="button">
<i class="fa fa-plus"> </i>
</button>
</div>
</div>
</td>
</tr>
<tr>
<td><input type="checkbox"/></td>
<td>
<select class="form-control input-sm">
<option>linkRef</option>
</select>
</td>
<td>
<div class="input-group">
<input type="text" class="form-control input-sm" disabled="true"/>
<div class="input-group-btn">
<button class="btn btn-sm btn-primary" type="button">
<i class="fa fa-pencil-square-o"> </i>
</button>
<button class="btn btn-sm btn-danger" type="button">
<i class="fa fa-minus"> </i>
</button>
<button class="btn btn-sm btn-success" type="button">
<i class="fa fa-plus"> </i>
</button>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
<td><a class="btn btn-sm btn-success">Add property</a></td>
<td></td>
</tr>
</tbody>
</table>
</div>
</div>

<div class="main-button-bar">
<a class="btn btn-danger" wicket:id="clear"/>
<a class="btn btn-primary" wicket:id="search"/>
</div>
</form>
</wicket:extend>
</body>
</html>
63 changes: 62 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.java
View file
Expand Up @@ -21,20 +21,81 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.data.TablePanel;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;

import java.util.List;

/**
* @author lazyman
*/
@PageDescriptor(url = "/admin/users/find", action = {@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_NO_ACCESS_URL)})
@PageDescriptor(url = "/admin/users/find", action = {
@AuthorizationAction(actionUri = PageAdminUsers.AUTH_USERS_ALL,
label = PageAdminUsers.AUTH_USERS_ALL_LABEL,
description = PageAdminUsers.AUTH_USERS_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_FIND_USERS_URL,
label = "PageFindUsers.auth.users.label",
description = "PageFindUsers.auth.users.description")})
public class PageFindUsers extends PageAdminUsers {

private static final Trace LOGGER = TraceManager.getTrace(PageFindUsers.class);
private static final String DOT_CLASS = PageFindUsers.class.getName() + ".";

private static final String ID_FORM = "form";
private static final String ID_TABLE = "table";
private static final String ID_CLEAR = "clear";
private static final String ID_SEARCH = "search";

public PageFindUsers() {
initLayout();
}

private void initLayout() {
Form form = new Form(ID_FORM);
add(form);

// ISortableDataProvider provider = null; //todo implement
// List<IColumn> columns = null; //todo implement
// TablePanel table = new TablePanel(ID_TABLE, provider, columns);
// form.add(table);

WebMarkupContainer table = new WebMarkupContainer(ID_TABLE);
form.add(table);

initButtons(form);
}

private void initButtons(Form form) {
AjaxButton clear = new AjaxButton(ID_CLEAR, createStringResource("PageFindUsers.clear")) {

@Override
public void onClick(AjaxRequestTarget target) {
clearSearch(target);
}
};
form.add(clear);

AjaxButton search = new AjaxButton(ID_SEARCH, createStringResource("PageFindUsers.search")) {

@Override
public void onClick(AjaxRequestTarget target) {
search(target);
}
};
form.add(search);
}

private void clearSearch(AjaxRequestTarget target) {
//todo implement
}

private void search(AjaxRequestTarget target) {
//todo implement
}
}
4 changes: 3 additions & 1 deletion ...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.properties
View file
Expand Up @@ -15,4 +15,6 @@
#

page.title=Find users
page.subTitle=in midPoint
page.subTitle=in midPoint
PageFindUsers.search=Search
PageFindUsers.clear=Clear

0 comments on commit a2d7d15

Please sign in to comment.