Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/boot
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Sep 18, 2017
2 parents a213303 + 3c692a7 commit 64b37ec
Show file tree
Hide file tree
Showing 294 changed files with 13,900 additions and 4,522 deletions.
8 changes: 2 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
View file
Expand Up @@ -17,6 +17,7 @@
package com.evolveum.midpoint.gui.api.component.result;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.prism.Visitable;
import com.evolveum.midpoint.prism.Visitor;
import com.evolveum.midpoint.schema.result.OperationResult;
Expand All @@ -34,8 +35,6 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.Validate;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;

import java.io.PrintWriter;
import java.io.Serializable;
Expand Down Expand Up @@ -92,10 +91,7 @@ public static OpResult getOpResult(PageBase page, OperationResult result){
if (result.getCause() != null && result.getCause() instanceof CommonException){
LocalizableMessage localizableMessage = ((CommonException) result.getCause()).getUserFriendlyMessage();
if (localizableMessage != null) {
String key = localizableMessage.getKey() != null ? localizableMessage.getKey() : localizableMessage.getFallbackMessage();
StringResourceModel stringResourceModel = new StringResourceModel(key, page).setModel(new Model<String>()).setDefaultValue(localizableMessage.getFallbackMessage())
.setParameters(localizableMessage.getArgs());
opResult.message = stringResourceModel.getString();
opResult.message = WebComponentUtil.resolveLocalizableMessage(localizableMessage, page);
}
}

Expand Down
1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
View file
Expand Up @@ -18,6 +18,7 @@
<html xmlns:wicket="http://wicket.apache.org" lang="en" class="no-js">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<wicket:header-items/>
<title>
<span wicket:id="title"/>
</title>
Expand Down
30 changes: 26 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -18,6 +18,7 @@

import com.evolveum.midpoint.audit.api.AuditService;
import com.evolveum.midpoint.common.SystemConfigurationHolder;

import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
import com.evolveum.midpoint.common.validator.EventHandler;
import com.evolveum.midpoint.common.validator.EventResult;
Expand Down Expand Up @@ -90,6 +91,7 @@
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.valuePolicy.PageValuePolicies;
import com.evolveum.midpoint.web.page.admin.workflow.*;
import com.evolveum.midpoint.web.page.login.PageLogin;
import com.evolveum.midpoint.web.page.self.*;
Expand Down Expand Up @@ -451,6 +453,7 @@ public AuditService getAuditService() {
return auditService;
}


public AccessCertificationService getCertificationService() {
return certficationService;
}
Expand Down Expand Up @@ -692,9 +695,10 @@ private void initLayout() {
body.add(new AttributeAppender("class", "hold-transition ", " "));
body.add(new AttributeAppender("class", "custom-hold-transition ", " "));

if (deploymentInfoModel != null && deploymentInfoModel.getObject() != null &&
StringUtils.isNotEmpty(deploymentInfoModel.getObject().getSkin())) {
Boolean usingSkin = deploymentInfoModel != null && deploymentInfoModel.getObject() != null &&
StringUtils.isNotEmpty(deploymentInfoModel.getObject().getSkin());

if (usingSkin) {
body.add(new AttributeAppender("class", deploymentInfoModel.getObject().getSkin(), " "));
} else {
body.add(new AttributeAppender("class", CLASS_DEFAULT_SKIN, " "));
Expand Down Expand Up @@ -777,8 +781,11 @@ public boolean isVisible() {
"background-color: " + deploymentInfoModel.getObject().getHeaderColor() + "; !important;"));
mainHeader.add(new AttributeAppender("style",
"background-color: " + deploymentInfoModel.getObject().getHeaderColor() + "; !important;"));
navigation.add(new AttributeAppender("style",
"background-color: " + deploymentInfoModel.getObject().getHeaderColor() + "; !important;"));
//using a skin overrides the navigation color
if (!usingSkin) {
navigation.add(new AttributeAppender("style",
"background-color: " + deploymentInfoModel.getObject().getHeaderColor() + "; !important;"));
}
}
initDebugBarLayout();

Expand Down Expand Up @@ -1252,6 +1259,11 @@ protected List<SideBarMenuItem> createMenuItems() {
items.add(createResourcesItems());
}

if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_URL,
AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
items.add(createValuePolicieItems());
}

if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_MY_WORK_ITEMS_URL,
AuthorizationConstants.AUTZ_UI_APPROVALS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL,
AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
Expand Down Expand Up @@ -1404,6 +1416,16 @@ private MainMenuItem createResourcesItems() {
return item;
}

private MainMenuItem createValuePolicieItems(){
MainMenuItem item = new MainMenuItem("fa fa-asterisk", createStringResource("PageAdmin.menu.top.valuePolicies"),null);
List<MenuItem> submenu = item.getItems();

MenuItem list = new MenuItem(createStringResource("PageAdmin.menu.top.valuePolicies.list"), PageValuePolicies.class);
submenu.add(list);

return item;
}

private MainMenuItem createReportsItems() {
MainMenuItem item = new MainMenuItem("fa fa-pie-chart", createStringResource("PageAdmin.menu.top.reports"),
null);
Expand Down
54 changes: 44 additions & 10 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Expand Up @@ -37,6 +37,8 @@
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.schema.GetOperationOptions;
import com.evolveum.midpoint.schema.SelectorOptions;
import com.evolveum.midpoint.schema.util.LocalizationUtil;
import com.evolveum.midpoint.util.*;
import com.evolveum.midpoint.web.component.prism.InputPanel;
import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
Expand All @@ -47,11 +49,7 @@
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.validator.routines.checkdigit.VerhoeffCheckDigit;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.Session;
import org.apache.wicket.*;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
Expand All @@ -68,6 +66,7 @@
import org.apache.wicket.markup.html.form.*;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
Expand Down Expand Up @@ -123,11 +122,6 @@
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.security.api.MidPointPrincipal;
import com.evolveum.midpoint.task.api.TaskCategory;
import com.evolveum.midpoint.util.DOMUtil;
import com.evolveum.midpoint.util.DebugUtil;
import com.evolveum.midpoint.util.DisplayableValue;
import com.evolveum.midpoint.util.MiscUtil;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SystemException;
import com.evolveum.midpoint.util.logging.LoggingUtils;
Expand Down Expand Up @@ -284,6 +278,46 @@ protected void onUpdate(AjaxRequestTarget target) {
});
}

public static String resolveLocalizableMessage(LocalizableMessageType localizableMessage, Component component) {
if (localizableMessage == null) {
return null;
}
return resolveLocalizableMessage(LocalizationUtil.parseLocalizableMessageType(localizableMessage), component);
}

public static String resolveLocalizableMessage(LocalizableMessage localizableMessage, Component component) {
if (localizableMessage == null) {
return null;
}
while (localizableMessage.getFallbackLocalizableMessage() != null) {
if (localizableMessage.getKey() != null) {
Localizer localizer = Application.get().getResourceSettings().getLocalizer();
if (localizer.getStringIgnoreSettings(localizableMessage.getKey(), component, null, null) != null) {
break; // the key exists => we can use the current localizableMessage
}
}
localizableMessage = localizableMessage.getFallbackLocalizableMessage();
}
String key = localizableMessage.getKey() != null ? localizableMessage.getKey() : localizableMessage.getFallbackMessage();
StringResourceModel stringResourceModel = new StringResourceModel(key, component)
.setModel(new Model<String>())
.setDefaultValue(localizableMessage.getFallbackMessage())
.setParameters(resolveArguments(localizableMessage.getArgs(), component));
return stringResourceModel.getString();
}

private static Object[] resolveArguments(Object[] args, Component component) {
Object[] rv = new Object[args.length];
for (int i = 0; i < args.length; i++) {
if (args[i] instanceof LocalizableMessage) {
rv[i] = resolveLocalizableMessage(((LocalizableMessage) args[i]), component);
} else {
rv[i] = args[i];
}
}
return rv;
}

public enum Channel {
// TODO: move this to schema component
LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),
Expand Down
53 changes: 0 additions & 53 deletions .../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
View file

This file was deleted.

0 comments on commit 64b37ec

Please sign in to comment.