Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Mar 14, 2016
2 parents 42478f3 + 67bb54e commit 8ad2ef5
Show file tree
Hide file tree
Showing 60 changed files with 1,892 additions and 428 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
View file
Expand Up @@ -131,7 +131,7 @@
<span class="page-title" wicket:id="pageTitle">
<span wicket:id="pageTitleReal"></span>
</span>
<img id="ajax_busy" src="img/ajax-loader.gif"/>
<img id="ajax_busy" src="img/ajax-loader.gif" style="margin-top: -8px; margin-left: 5px;" />
</div>

<!-- Navbar Right Menu -->
Expand Down
12 changes: 2 additions & 10 deletions ...ui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/BreadcrumbPageClass.java
View file
Expand Up @@ -32,23 +32,15 @@ public class BreadcrumbPageClass extends Breadcrumb {
private Class<? extends WebPage> page;
private PageParameters parameters;

public BreadcrumbPageClass(IModel<String> label) {
super(label);

setUseLink(true);
}

public BreadcrumbPageClass(IModel<String> label, Class<? extends WebPage> page) {
this(label, page, null);
}

public BreadcrumbPageClass(IModel<String> label, Class<? extends WebPage> page, PageParameters parameters) {
super(label);

Validate.notNull(page, "Page class must not be null");

this.page = page;
this.parameters = parameters;

setUseLink(true);
}

public Class<? extends WebPage> getPage() {
Expand Down
5 changes: 1 addition & 4 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
View file
Expand Up @@ -24,10 +24,7 @@

<div class="col-lg-8">
<div>
<label class="col-lg-2 checkbox-inline">
<input type="checkbox" wicket:id="edit">
<wicket:message key="pageDebugView.edit"/>
</label>

<label class="col-lg-3 checkbox-inline">
<input type="checkbox" wicket:id="encrypt">
<wicket:message key="pageDebugView.encrypt"/>
Expand Down
19 changes: 1 addition & 18 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
View file
Expand Up @@ -182,7 +182,7 @@ private ObjectViewDto loadObject() {
private void initLayout() {
add(mainForm);

final IModel<Boolean> editable = new Model<Boolean>(false);
// final IModel<Boolean> editable = new Model<Boolean>(false);

mainForm.add(new AjaxCheckBox("encrypt", encrypt) {

Expand Down Expand Up @@ -212,14 +212,6 @@ protected void onUpdate(AjaxRequestTarget target) {
}
});

mainForm.add(new AjaxCheckBox("edit", editable) {

@Override
protected void onUpdate(AjaxRequestTarget target) {
editPerformed(target, editable.getObject());
}
});

mainForm.add(new AjaxCheckBox("switchToPlainText", switchToPlainText) {

@Override
Expand All @@ -238,12 +230,10 @@ protected void onUpdate(AjaxRequestTarget target) {
plainTextarea = new TextArea<>(ID_PLAIN_TEXTAREA,
new PropertyModel<String>(model, ObjectViewDto.F_XML));
plainTextarea.setVisible(false);
plainTextarea.setEnabled(editable.getObject());

mainForm.add(plainTextarea);

editor = new AceEditor("aceEditor", new PropertyModel<String>(model, ObjectViewDto.F_XML));
editor.setReadonly(!editable.getObject());
mainForm.add(editor);

initButtons(mainForm);
Expand Down Expand Up @@ -275,13 +265,6 @@ public void onClick(AjaxRequestTarget target) {
};
mainForm.add(backButton);
}

public void editPerformed(AjaxRequestTarget target, boolean editable) {
editor.setReadonly(!editable);
plainTextarea.setEnabled(editable);
target.add(mainForm);
editor.refreshReadonly(target);
}

private boolean isReport(PrismObject object){
if (object.getCompileTimeClass() != null && object.getCompileTimeClass() == ReportType.class){
Expand Down
5 changes: 4 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
View file
Expand Up @@ -148,9 +148,12 @@ private AccountCallableResult<List<SimpleAccountDto>> loadAccounts() throws Exce
Task task = createSimpleTask(OPERATION_LOAD_ACCOUNTS);
OperationResult result = task.getResult();
callableResult.setResult(result);
GetOperationOptions getOpts = GetOperationOptions.createResolve();
getOpts.setNoFetch(Boolean.TRUE);
Collection<SelectorOptions<GetOperationOptions>> options =
SelectorOptions.createCollection(ShadowType.F_RESOURCE, GetOperationOptions.createResolve());
SelectorOptions.createCollection(ShadowType.F_RESOURCE, getOpts);


List<ObjectReferenceType> references = user.asObjectable().getLinkRef();
for (ObjectReferenceType reference : references) {
PrismObject<ShadowType> account = WebModelServiceUtils.loadObject(ShadowType.class, reference.getOid(),
Expand Down
1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
View file
Expand Up @@ -33,6 +33,7 @@ <h3>
<p wicket:id="message" />

<div class="main-button-bar">
<a class="btn btn-primary" wicket:id="home" />
<a class="btn btn-primary" wicket:id="back" />
</div>

Expand Down
34 changes: 28 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
View file
Expand Up @@ -26,6 +26,7 @@
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.home.PageDashboard;
import com.evolveum.midpoint.web.page.self.PageSelfDashboard;
import com.evolveum.midpoint.web.session.SessionStorage;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
Expand All @@ -49,6 +50,7 @@ public class PageError extends PageBase {
private static final String ID_LABEL = "label";
private static final String ID_MESSAGE = "message";
private static final String ID_BACK = "back";
private static final String ID_HOME = "home";

private static final Trace LOGGER = TraceManager.getTrace(PageError.class);

Expand Down Expand Up @@ -123,15 +125,19 @@ public boolean isVisible() {

@Override
public void onClick(AjaxRequestTarget target) {
if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
setResponsePage(PageDashboard.class);
} else {
setResponsePage(PageSelfDashboard.class);
}
backPerformed(target);
}
};
add(back);

AjaxButton home = new AjaxButton(ID_HOME, createStringResource("PageError.button.home")) {

@Override
public void onClick(AjaxRequestTarget target) {
homePerformed(target);
}
};
add(home);
}

private int getCode() {
Expand All @@ -154,4 +160,20 @@ public boolean isVersioned() {
public boolean isErrorPage() {
return true;
}

private void homePerformed(AjaxRequestTarget target) {
SessionStorage storage = getSessionStorage();
storage.clearBreadcrumbs();

if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
setResponsePage(PageDashboard.class);
} else {
setResponsePage(PageSelfDashboard.class);
}
}

private void backPerformed(AjaxRequestTarget target) {
redirectBack();
}
}
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -1562,7 +1562,7 @@ pageDebugView.validateSchema=Validate schema
PageError403.title=Forbidden (403)
PageError404.title=Not found (404)
PageError401.title=Unauthorized (401)
PageError.button.back=Back to dashboard
PageError.button.back=Back
PageError.message=Unexpected error occurred, if necessary please contact system administrator.
PageError.title=Internal error (500)
PageFindUsers.title=Find users
Expand Down Expand Up @@ -2986,3 +2986,4 @@ operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute.focus.Use
operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta=Execute delta (Model)
operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasts deeply (Task)
operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw (Task)
PageError.button.home=Home
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
View file
Expand Up @@ -1532,7 +1532,7 @@ pageDebugView.validateSchema=Validate schema
PageError403.title=Forbidden (403)
PageError404.title=Not found (404)
PageError401.title=Unauthorized (401)
PageError.button.back=Back to dashboard
PageError.button.back=Back
PageError.message=Unexpected error occurred, if necessary please contact system administrator.
PageError.title=Internal error (500)
PageFindUsers.title=Find users
Expand Down
11 changes: 11 additions & 0 deletions ...rs/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
View file
Expand Up @@ -55,6 +55,7 @@ public class DummyConfiguration extends AbstractConfiguration {
private boolean generateAccountDescriptionOnUpdate = false; // simulates volatile behavior (on update)
private String[] forbiddenNames = new String[0];
private boolean useLegacySchema = true;
private String requiredBaseContextOrgName = null;

/**
* Defines name of the dummy resource instance. There may be several dummy resource running in
Expand Down Expand Up @@ -306,6 +307,16 @@ public void setUseLegacySchema(boolean useLegacySchema) {
this.useLegacySchema = useLegacySchema;
}

@ConfigurationProperty(displayMessageKey = "UI_REQUIRED_BASE_CONTEXT_ORG_NAME",
helpMessageKey = "UI_REQUIRED_BASE_CONTEXT_ORG_NAME_HELP")
public String getRequiredBaseContextOrgName() {
return requiredBaseContextOrgName;
}

public void setRequiredBaseContextOrgName(String requiredBaseContextOrgName) {
this.requiredBaseContextOrgName = requiredBaseContextOrgName;
}

/**
* {@inheritDoc}
*/
Expand Down

0 comments on commit 8ad2ef5

Please sign in to comment.