Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Oct 12, 2018
2 parents e26e9ce + ff73603 commit 3a87434
Show file tree
Hide file tree
Showing 21 changed files with 713 additions and 98 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 @@ -123,7 +123,7 @@
</wicket:enclosure>
<div class="content-wrapper" style="min-height: 916px;">
<!-- Main content -->
<section class="content">
<section class="content col-xs-12" style="float:left;">
<div wicket:id="feedbackContainer" class="feedbackContainer">
<div wicket:id="feedback" class="messagePanel"/>
<!-- <div wicket:id="tempFeedback" class="tempMessage"/> -->
Expand Down
10 changes: 5 additions & 5 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html
View file
Expand Up @@ -15,14 +15,14 @@
~ limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<div wicket:id="summaryBox" class="info-box">
<div wicket:id="summaryBox" class="col-xs-12 info-box" style="padding: 0px; padding-bottom:5px">
<!-- take care that there are no whitespaces inside the following div -->
<div wicket:id="summaryIconBox" class="info-box-icon"><span class="user-thumbnail-helper"/><span wicket:id="summaryIcon"/><img wicket:id="summaryPhoto" class="user-thumbnail"/></div>
<div class="info-box-content">
<span class="summary-content-box">
<span class="summary-text-box">
<span class="info-box-number">
<span class="summary-panel-display-name" wicket:id="summaryDisplayName"/> <span class="summary-panel-identifier" wicket:id="summaryIdentifierPanel">(<span wicket:id="summaryIdentifier"/>)</span>
<span class="col-xs-12 col-sm-6 col-md-8 col-lg-9 summary-text-box" style="padding: 0px;">
<span class="col-xs-12 info-box-number" style="padding: 0px;">
<span class="col-xs-12 summary-panel-display-name" wicket:id="summaryDisplayName" style="padding: 0px;"/> <span class="col-xs-12 summary-panel-identifier" wicket:id="summaryIdentifierPanel" style="padding: 0px;">(<span wicket:id="summaryIdentifier"/>)</span>
</span>
<span wicket:id="summaryTitle" class="summary-panel-title">
</span>
Expand All @@ -33,7 +33,7 @@
<span wicket:id="summaryOrganization" class="summary-panel-organization">
</span>
</span>
<span wicket:id="summaryTagBox" class="summary-tag-box">
<span wicket:id="summaryTagBox" class="col-xs-12 col-sm-6 col-md-4 col-lg-3 summary-tag-box">
<wicket:child />
</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
View file
Expand Up @@ -59,7 +59,7 @@ public abstract class AbstractSummaryPanel<C extends Containerable> extends Base
protected static final String ID_PHOTO = "summaryPhoto"; // perhaps useful only for focal objects but it was simpler to include it here
protected static final String ID_ORGANIZATION = "summaryOrganization"; // similar (requires ObjectWrapper to get parent organizations so hard to use in ObjectSummaryPanel)

protected static final String BOX_CSS_CLASS = "info-box";
protected static final String BOX_CSS_CLASS = "col-xs-12 info-box";
protected static final String ICON_BOX_CSS_CLASS = "info-box-icon";

protected SummaryPanelSpecificationType configuration;
Expand Down
2 changes: 1 addition & 1 deletion ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html
View file
Expand Up @@ -17,7 +17,7 @@
xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
<div class="col-lg-3 col-xs-6">
<div class="col-lg-3 col-md-6 col-xs-12">
<div class="small-box shopping-cart-item-box">
<div wicket:id="itemButtonContainer">
<div wicket:id="inner" class="inner">
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.html
View file
Expand Up @@ -17,7 +17,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
<form wicket:id="mainForm" class="form-horizontal">
<form wicket:id="mainForm" class="col-xs-12 form-horizontal" style="padding:0px;">

<div wicket:id="tabPanel" class="nav-tabs-custom" />

Expand Down
4 changes: 2 additions & 2 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.html
View file
Expand Up @@ -17,7 +17,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div wicket:id="labelContainer" class="col-xs-2 prism-property-label">
<div wicket:id="labelContainer" class="col-md-2 col-xs-12 prism-property-label">
<span wicket:id="label"/>
<span wicket:id="required" style="color: #f00; font-weight: bold;"
wicket:message="title:prismPropertyPanel.required">*</span>
Expand All @@ -29,7 +29,7 @@
<i wicket:id="deprecated"/>
<i wicket:id="experimental"/>
</div>
<div class="col-md-10 prism-property-value" wicket:id="values">
<div class="col-md-10 col-xs-12 prism-property-value" wicket:id="values">
<div wicket:id="value"/>
</div>
</wicket:panel>
Expand Down
18 changes: 9 additions & 9 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
View file
Expand Up @@ -15,36 +15,36 @@
~ limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<form wicket:id="form" class="form-inline pull-right search-form">
<form wicket:id="form" class="form-inline pull-right search-form" style="padding-bottom:5px;">

<div class="form-group has-feedback" wicket:id="advancedGroup">
<label class="control-label" style="vertical-align: top;">
<div class="form-group has-feedback" wicket:id="advancedGroup" style="float:left; padding-right: 5px;">
<label class="control-label" style="vertical-align: top; float:left; padding-right: 5px;">
<i class="fa fa-lg" wicket:id="advancedCheck"/>
</label>
<textarea class="form-control input-sm" rows="2" wicket:id="advancedArea"
style="width: 220px; height: 60px; overflow: hidden;"
style="width: 220px; height: 60px; overflow: hidden; float:left;"
wicket:message="placeholder:SearchPanel.insertFilterXml"></textarea>
<span class="help-block" wicket:id="advancedError"/>
</div>

<div class="form-group" wicket:id="fullTextContainer">
<div class="form-group" wicket:id="fullTextContainer" style="float:left; padding-right: 5px;">
<input wicket:id="fullTextField" type="text" class="form-control input-sm" style="width: 150px; min-width: 150px;">
<!--<div wicket:id="fullTextField" wicket:message="placeholder:SearchPanel.fullTextSearch"></div>-->
</div>

<wicket:container wicket:id="items">
<div wicket:id="item" class="form-group"/>
<div wicket:id="item" class="form-group" style="float:left; padding-right: 5px;"/>
</wicket:container>

<div class="form-group" wicket:id="moreGroup">
<div class="form-group" wicket:id="moreGroup" style="float:left; padding-right: 5px;">
<a wicket:id="more" class="btn btn-sm btn-default">
<wicket:message key="SearchPanel.more"/>
&nbsp;
<span class="caret"></span>
</a>
</div>

<div class="form-group" style="vertical-align: top;" wicket:id="searchContainer">
<div class="form-group" style="vertical-align: top; float:left; padding-right: 5px;" wicket:id="searchContainer">
<a wicket:id="searchSimple" class="btn btn-sm btn-primary" about="searchSimple">
<i class="fa fa-search fa-lg"/>
</a>
Expand All @@ -67,7 +67,7 @@
</div>
</div>

<div class="form-group" wicket:id="linksContainer" style="vertical-align: top; margin-top: -5px;">
<div class="form-group" wicket:id="linksContainer" style="vertical-align: top; margin-top: -5px; float:left;">
<a class="btn btn-sm btn-link" wicket:id="basic" style="display: table-cell; vertical-align: top;"/>
<a class="btn btn-sm btn-link" wicket:id="advanced"/>
<a class="btn btn-sm btn-link" wicket:id="fullText" style=" margin-top: -20px;"/>
Expand Down
2 changes: 1 addition & 1 deletion ...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
View file
Expand Up @@ -18,7 +18,7 @@
<div class="row">
<wicket:child />
<div wicket:id="shoppingCartContainer">
<form class="col-md-4 search-form pull-right" wicket:id="searchForm">
<form class="col-lg-4 col-md-6 col-xs-12 search-form pull-right" wicket:id="searchForm">
<div wicket:id="search"/>
</form>
<div class="col-md-12" wicket:id="shoppingCartItemsPanel" />
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
View file
Expand Up @@ -278,4 +278,4 @@ div.search-popover {
max-width: 40%;
}
}
}
}
27 changes: 24 additions & 3 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultList.java
View file
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2014-2017 Evolveum
* Copyright (c) 2014-2018 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,6 +16,7 @@
package com.evolveum.midpoint.schema;

import com.evolveum.midpoint.prism.util.CloneUtil;
import com.evolveum.midpoint.util.ShortDumpable;

import java.io.Serializable;
import java.util.ArrayList;
Expand All @@ -28,8 +29,8 @@
* @author semancik
*
*/
public class SearchResultList<T> implements List<T>, Cloneable, Serializable {

public class SearchResultList<T> implements List<T>, Cloneable, Serializable, ShortDumpable {
private List<T> list = null;
private SearchResultMetadata metadata = null;

Expand Down Expand Up @@ -224,4 +225,24 @@ private List<T> getInitializedList() {
return list;
}

@Override
public void shortDump(StringBuilder sb) {
if (metadata == null) {
if (list == null) {
sb.append("null");
} else {
sb.append(list.size()).append(" results");
}
} else {
if (list == null) {
sb.append("null, metadata=(");
} else {
sb.append(list.size()).append(" results, metadata=(");
}
metadata.shortDump(sb);
sb.append(")");
}

}

}
17 changes: 12 additions & 5 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultMetadata.java
View file
Expand Up @@ -123,19 +123,26 @@ public boolean equals(Object obj) {

@Override
public String toString() {
return "SearchResultMetadata(pagingCookie=" + pagingCookie + ", approxNumberOfAllResults="
+ approxNumberOfAllResults + ", partialResults=" + partialResults + ")";
StringBuilder sb = new StringBuilder("SearchResultMetadata(");
shortDump(sb);
sb.append(")");
return sb.toString();
}

@Override
public void shortDump(StringBuilder sb) {
if (pagingCookie != null) {
sb.append("pagingCookie=").append(pagingCookie).append(", ");
sb.append("pagingCookie=").append(pagingCookie).append(",");
}
if (approxNumberOfAllResults != null) {
sb.append("approxNumberOfAllResults=").append(approxNumberOfAllResults).append(", ");
sb.append("approxNumberOfAllResults=").append(approxNumberOfAllResults).append(",");
}
if (partialResults) {
sb.append("partialResults=true,");
}
if (pagingCookie != null || approxNumberOfAllResults != null || partialResults) {
sb.setLength(sb.length() - 1);
}
sb.append("partialResults=").append(partialResults);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
View file
Expand Up @@ -112,7 +112,9 @@ public interface ModelService {
static final String MERGE_OBJECTS = CLASS_NAME_WITH_DOT + "mergeObjects";

static final String AUTZ_NAMESPACE = AuthorizationConstants.NS_AUTHORIZATION_MODEL;


static final String OPERATION_LOGGGER_NAME = "com.evolveum.midpoint.model.api.op";

/**
* <p>
* Returns object for provided OID. It retrieves the object from an appropriate source
Expand Down

0 comments on commit 3a87434

Please sign in to comment.