Skip to content

Commit

Permalink
Merge branch 'master' into feature/repo-ng
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Jun 25, 2020
2 parents e93f21d + 023def3 commit 36c4dae
Show file tree
Hide file tree
Showing 50 changed files with 1,300 additions and 514 deletions.
30 changes: 15 additions & 15 deletions config/sql/h2-4.2-all.sql
View file
Expand Up @@ -3,21 +3,21 @@
-- If you want to add Quartz-related tables, please use files from quartz directory.

CREATE TABLE m_acc_cert_campaign (
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_type INTEGER,
endTimestamp TIMESTAMP,
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp TIMESTAMP,
state INTEGER,
oid VARCHAR(36) NOT NULL,
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_targetType INTEGER,
endTimestamp TIMESTAMP,
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp TIMESTAMP,
state INTEGER,
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
);
CREATE TABLE m_acc_cert_case (
Expand Down
4 changes: 4 additions & 0 deletions config/sql/h2-upgrade-4.0-4.2.sql
View file
Expand Up @@ -5,4 +5,8 @@ CREATE INDEX iOpExecTimestampValue

UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign ALTER COLUMN definitionRef_type RENAME TO definitionRef_targetType;

COMMIT;
30 changes: 15 additions & 15 deletions config/sql/mysql-4.2-all-utf8mb4.sql
View file
@@ -1,21 +1,21 @@
-- remove iAncestor and iDescendant index, they are the same as FK for that fields

CREATE TABLE m_acc_cert_campaign (
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin,
definitionRef_type INTEGER,
endTimestamp DATETIME(6),
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(191),
name_orig VARCHAR(191),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp DATETIME(6),
state INTEGER,
oid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin NOT NULL,
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin,
definitionRef_targetType INTEGER,
endTimestamp DATETIME(6),
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(191),
name_orig VARCHAR(191),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp DATETIME(6),
state INTEGER,
oid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin NOT NULL,
PRIMARY KEY (oid)
)
DEFAULT CHARACTER SET utf8mb4
Expand Down
30 changes: 15 additions & 15 deletions config/sql/mysql-4.2-all.sql
View file
@@ -1,21 +1,21 @@
-- remove iAncestor and iDescendant index, they are the same as FK for that fields

CREATE TABLE m_acc_cert_campaign (
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_type INTEGER,
endTimestamp DATETIME(6),
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp DATETIME(6),
state INTEGER,
oid VARCHAR(36) NOT NULL,
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_targetType INTEGER,
endTimestamp DATETIME(6),
handlerUri VARCHAR(255),
iteration INTEGER NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INTEGER,
stageNumber INTEGER,
startTimestamp DATETIME(6),
state INTEGER,
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
)
DEFAULT CHARACTER SET utf8
Expand Down
4 changes: 4 additions & 0 deletions config/sql/mysql-upgrade-4.0-4.2-utf8mb4.sql
View file
Expand Up @@ -5,4 +5,8 @@ CREATE INDEX iOpExecTimestampValue

UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;

COMMIT;
4 changes: 4 additions & 0 deletions config/sql/mysql-upgrade-4.0-4.2.sql
View file
Expand Up @@ -5,4 +5,8 @@ CREATE INDEX iOpExecTimestampValue

UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;

COMMIT;
30 changes: 15 additions & 15 deletions config/sql/oracle-4.2-all.sql
View file
@@ -1,19 +1,19 @@
CREATE TABLE m_acc_cert_campaign (
definitionRef_relation VARCHAR2(157 CHAR),
definitionRef_targetOid VARCHAR2(36 CHAR),
definitionRef_type NUMBER(10, 0),
endTimestamp TIMESTAMP,
handlerUri VARCHAR2(255 CHAR),
iteration NUMBER(10, 0) NOT NULL,
name_norm VARCHAR2(255 CHAR),
name_orig VARCHAR2(255 CHAR),
ownerRef_relation VARCHAR2(157 CHAR),
ownerRef_targetOid VARCHAR2(36 CHAR),
ownerRef_type NUMBER(10, 0),
stageNumber NUMBER(10, 0),
startTimestamp TIMESTAMP,
state NUMBER(10, 0),
oid VARCHAR2(36 CHAR) NOT NULL,
definitionRef_relation VARCHAR2(157 CHAR),
definitionRef_targetOid VARCHAR2(36 CHAR),
definitionRef_targetType NUMBER(10, 0),
endTimestamp TIMESTAMP,
handlerUri VARCHAR2(255 CHAR),
iteration NUMBER(10, 0) NOT NULL,
name_norm VARCHAR2(255 CHAR),
name_orig VARCHAR2(255 CHAR),
ownerRef_relation VARCHAR2(157 CHAR),
ownerRef_targetOid VARCHAR2(36 CHAR),
ownerRef_type NUMBER(10, 0),
stageNumber NUMBER(10, 0),
startTimestamp TIMESTAMP,
state NUMBER(10, 0),
oid VARCHAR2(36 CHAR) NOT NULL,
PRIMARY KEY (oid)
) INITRANS 30;
CREATE TABLE m_acc_cert_case (
Expand Down
4 changes: 4 additions & 0 deletions config/sql/oracle-upgrade-4.0-4.2.sql
View file
Expand Up @@ -5,4 +5,8 @@ CREATE INDEX iOpExecTimestampValue

UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;

COMMIT;
30 changes: 15 additions & 15 deletions config/sql/postgresql-4.2-all.sql
View file
@@ -1,19 +1,19 @@
CREATE TABLE m_acc_cert_campaign (
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_type INT4,
endTimestamp TIMESTAMP,
handlerUri VARCHAR(255),
iteration INT4 NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INT4,
stageNumber INT4,
startTimestamp TIMESTAMP,
state INT4,
oid VARCHAR(36) NOT NULL,
definitionRef_relation VARCHAR(157),
definitionRef_targetOid VARCHAR(36),
definitionRef_targetType INT4,
endTimestamp TIMESTAMP,
handlerUri VARCHAR(255),
iteration INT4 NOT NULL,
name_norm VARCHAR(255),
name_orig VARCHAR(255),
ownerRef_relation VARCHAR(157),
ownerRef_targetOid VARCHAR(36),
ownerRef_type INT4,
stageNumber INT4,
startTimestamp TIMESTAMP,
state INT4,
oid VARCHAR(36) NOT NULL,
PRIMARY KEY (oid)
);
CREATE TABLE m_acc_cert_case (
Expand Down
4 changes: 4 additions & 0 deletions config/sql/postgresql-upgrade-4.0-4.2.sql
View file
Expand Up @@ -5,4 +5,8 @@ CREATE INDEX iOpExecTimestampValue

UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';

-- 2020-06-25 11:35

ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;

COMMIT;
30 changes: 15 additions & 15 deletions config/sql/sqlserver-4.2-all.sql
View file
@@ -1,19 +1,19 @@
CREATE TABLE m_acc_cert_campaign (
definitionRef_relation NVARCHAR(157) COLLATE database_default,
definitionRef_targetOid NVARCHAR(36) COLLATE database_default,
definitionRef_type INT,
endTimestamp DATETIME2,
handlerUri NVARCHAR(255) COLLATE database_default,
iteration INT NOT NULL,
name_norm NVARCHAR(255) COLLATE database_default,
name_orig NVARCHAR(255) COLLATE database_default,
ownerRef_relation NVARCHAR(157) COLLATE database_default,
ownerRef_targetOid NVARCHAR(36) COLLATE database_default,
ownerRef_type INT,
stageNumber INT,
startTimestamp DATETIME2,
state INT,
oid NVARCHAR(36) COLLATE database_default NOT NULL,
definitionRef_relation NVARCHAR(157) COLLATE database_default,
definitionRef_targetOid NVARCHAR(36) COLLATE database_default,
definitionRef_targetType INT,
endTimestamp DATETIME2,
handlerUri NVARCHAR(255) COLLATE database_default,
iteration INT NOT NULL,
name_norm NVARCHAR(255) COLLATE database_default,
name_orig NVARCHAR(255) COLLATE database_default,
ownerRef_relation NVARCHAR(157) COLLATE database_default,
ownerRef_targetOid NVARCHAR(36) COLLATE database_default,
ownerRef_type INT,
stageNumber INT,
startTimestamp DATETIME2,
state INT,
oid NVARCHAR(36) COLLATE database_default NOT NULL,
PRIMARY KEY (oid)
);
CREATE TABLE m_acc_cert_case (
Expand Down
4 changes: 4 additions & 0 deletions config/sql/sqlserver-upgrade-4.0-4.2.sql
View file
Expand Up @@ -7,4 +7,8 @@ BEGIN TRANSACTION
UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
COMMIT;

-- 2020-06-25 11:35

UPDATE m_acc_cert_campaign SET definitionRef_type = convert(INT, definitionRef_targetType) where definitionRef_targetType is not null;

GO
2 changes: 1 addition & 1 deletion ...rc/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/ReferenceConverter.java
View file
Expand Up @@ -57,7 +57,7 @@ public ObjectReferenceType convertToObject(String value, Locale locale) throws C
if (CollectionUtils.isNotEmpty(objectsList)){
return ObjectTypeUtil.createObjectRefWithFullObject(objectsList.get(0), pageBase.getPrismContext());
}
return originConverter.convertToObject(value, locale);
return null;

}

Expand Down
14 changes: 14 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Expand Up @@ -4396,6 +4396,20 @@ public static Class<? extends PageBase> resolveSelfPage() {
return null;
}

public static <I extends Item> PrismObject<LookupTableType> findLookupTable(ItemDefinition<I> definition, PageBase page) {
PrismReferenceValue valueEnumerationRef = definition.getValueEnumerationRef();
if (valueEnumerationRef == null) {
return null;
}

String lookupTableUid = valueEnumerationRef.getOid();
Task task = page.createSimpleTask("loadLookupTable");
OperationResult result = task.getResult();

Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils.createLookupTableRetrieveOptions(page.getSchemaHelper());
return WebModelServiceUtils.loadObject(LookupTableType.class, lookupTableUid, options, page, task, result);
}

public static <AH extends AssignmentHolderType> boolean hasAnyArchetypeAssignemnt(AH assignmentHolder) {
if (assignmentHolder.getAssignment() == null) {
return false;
Expand Down
17 changes: 17 additions & 0 deletions .../src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterPanelFactory.java
View file
Expand Up @@ -9,6 +9,15 @@

import javax.annotation.PostConstruct;

import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.web.page.admin.reports.component.SearchFilterConfigurationPanel;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;

import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.wicket.markup.html.panel.Panel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand All @@ -34,6 +43,14 @@ public <IW extends ItemWrapper> boolean match(IW wrapper) {

@Override
protected Panel getPanel(PrismPropertyPanelContext<SearchFilterType> panelCtx) {
PrismPropertyWrapper<SearchFilterType> searchFilterItemWrapper = panelCtx.unwrapWrapperModel();
PrismContainerValueWrapper containerWrapper = searchFilterItemWrapper.getParent();
if (containerWrapper != null && containerWrapper.getRealValue() instanceof ObjectCollectionType){
ObjectCollectionType collectionObj = (ObjectCollectionType) containerWrapper.getRealValue();
return new SearchFilterConfigurationPanel(panelCtx.getComponentId(), panelCtx.getRealValueModel(),
(Class<? extends ObjectType>)WebComponentUtil.qnameToClass(panelCtx.getPageBase().getPrismContext(),
collectionObj.getType() != null ? collectionObj.getType() : ObjectType.COMPLEX_TYPE));
}
return new AceEditorPanel(panelCtx.getComponentId(), null, new SearchFilterTypeModel(panelCtx.getRealValueModel(), panelCtx.getPageBase()), 10);
}

Expand Down
3 changes: 3 additions & 0 deletions ...java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismContainerWrapperFactoryImpl.java
View file
Expand Up @@ -81,6 +81,9 @@ public PrismContainerValueWrapper<C> createValueWrapper(PrismContainerWrapper<C>
}

protected List<? extends ItemDefinition> getItemDefinitions(PrismContainerWrapper<C> parent, PrismContainerValue<C> value) {
if (parent == null){
return new ArrayList<>();
}
return parent.getDefinitions();
}

Expand Down
5 changes: 3 additions & 2 deletions ...ain/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.html
View file
Expand Up @@ -13,8 +13,9 @@
<wicket:child/>
</div>
<div wicket:id="buttonsPanel" class="box-footer pull-right">
<a wicket:id="applyFilterButton" class="btn btn-group btn-sm btn-default"></a>
<a wicket:id="saveFilterButton" class="btn btn-group btn-sm btn-default"></a>
<a wicket:id="okButton" class="btn btn-group btn-sm btn-default"></a>
<!-- <a wicket:id="applyFilterButton" class="btn btn-group btn-sm btn-default"></a>-->
<!-- <a wicket:id="saveFilterButton" class="btn btn-group btn-sm btn-default"></a>-->
<a wicket:id="cancelButton" class="btn btn-group btn-sm btn-default"></a>
</div>
</wicket:panel>
Expand Down

0 comments on commit 36c4dae

Please sign in to comment.