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 Apr 16, 2018
2 parents 9d6f9b2 + 1067456 commit b30b119
Show file tree
Hide file tree
Showing 61 changed files with 6,343 additions and 182 deletions.
1 change: 1 addition & 0 deletions config/sql/_all/h2-3.8-all.sql
View file
Expand Up @@ -237,6 +237,7 @@ CREATE TABLE m_audit_event (
targetOid VARCHAR(36),
targetOwnerName VARCHAR(255),
targetOwnerOid VARCHAR(36),
targetOwnerType INTEGER,
targetType INTEGER,
taskIdentifier VARCHAR(255),
taskOID VARCHAR(255),
Expand Down
1 change: 1 addition & 0 deletions config/sql/_all/mysql-3.8-all-utf8mb4.sql
View file
Expand Up @@ -283,6 +283,7 @@ CREATE TABLE m_audit_event (
targetOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
targetOwnerName VARCHAR(255),
targetOwnerOid VARCHAR(36) CHARSET utf8 COLLATE utf8_bin ,
targetOwnerType INTEGER,
targetType INTEGER,
taskIdentifier VARCHAR(255),
taskOID VARCHAR(255) CHARSET utf8 COLLATE utf8_bin ,
Expand Down
1 change: 1 addition & 0 deletions config/sql/_all/mysql-3.8-all.sql
View file
Expand Up @@ -283,6 +283,7 @@ CREATE TABLE m_audit_event (
targetOid VARCHAR(36),
targetOwnerName VARCHAR(255),
targetOwnerOid VARCHAR(36),
targetOwnerType INTEGER,
targetType INTEGER,
taskIdentifier VARCHAR(255),
taskOID VARCHAR(255),
Expand Down
1 change: 1 addition & 0 deletions config/sql/_all/oracle-3.8-all.sql
View file
Expand Up @@ -233,6 +233,7 @@ CREATE TABLE m_audit_event (
targetOid VARCHAR2(36 CHAR),
targetOwnerName VARCHAR2(255 CHAR),
targetOwnerOid VARCHAR2(36 CHAR),
targetOwnerType NUMBER(10, 0),
targetType NUMBER(10, 0),
taskIdentifier VARCHAR2(255 CHAR),
taskOID VARCHAR2(255 CHAR),
Expand Down
1 change: 1 addition & 0 deletions config/sql/_all/postgresql-3.8-all.sql
View file
Expand Up @@ -233,6 +233,7 @@ CREATE TABLE m_audit_event (
targetOid VARCHAR(36),
targetOwnerName VARCHAR(255),
targetOwnerOid VARCHAR(36),
targetOwnerType INT4,
targetType INT4,
taskIdentifier VARCHAR(255),
taskOID VARCHAR(255),
Expand Down
1 change: 1 addition & 0 deletions config/sql/_all/sqlserver-3.8-all.sql
View file
Expand Up @@ -233,6 +233,7 @@ CREATE TABLE m_audit_event (
targetOid NVARCHAR(36) COLLATE database_default,
targetOwnerName NVARCHAR(255) COLLATE database_default,
targetOwnerOid NVARCHAR(36) COLLATE database_default,
targetOwnerType INT,
targetType INT,
taskIdentifier NVARCHAR(255) COLLATE database_default,
taskOID NVARCHAR(255) COLLATE database_default,
Expand Down
4 changes: 3 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -1546,7 +1546,9 @@ public String getBubbleLabel() {
addMenuItem(item, "PageAdmin.menu.top.cases.listAll", PageCasesAll.class);
addMenuItem(item, "PageAdmin.menu.top.caseWorkItems.list", PageCaseWorkItemsAllocatedToMe.class);
addMenuItem(item, "PageAdmin.menu.top.caseWorkItems.listAll", PageCaseWorkItemsAll.class);
addMenuItem(item, "PageAdmin.menu.top.caseWorkItems.view", PageCaseWorkItem.class);

createFocusPageViewMenu(item.getItems(), "PageAdmin.menu.top.caseWorkItems.view", PageCaseWorkItem.class);

addMenuItem(item, "PageAdmin.menu.top.case.new", PageCase.class);

return item;
Expand Down
4 changes: 4 additions & 0 deletions gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
View file
Expand Up @@ -53,6 +53,10 @@
<key>fi</key>
<label>Suomi</label>
</row>
<row>
<key>fr</key>
<label>Français</label>
</row>
<row>
<key>hu</key>
<label>Magyar</label>
Expand Down
4 changes: 4 additions & 0 deletions gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
View file
Expand Up @@ -44,6 +44,10 @@
<key>fi</key>
<label>Suomi</label>
</row>
<row>
<key>fr</key>
<label>Français</label>
</row>
<row>
<key>hu</key>
<label>Magyar</label>
Expand Down
4 changes: 3 additions & 1 deletion gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
View file
Expand Up @@ -2979,7 +2979,7 @@ SystemConfigPanel.mail.server.remove.warn=Could not delete selected mail server
SystemConfigPanel.mail.server.tooltip=Select the mail server to configure it. To add new configuration, press '+' button. To remove selected configuration, press '-' button.
SystemConfigPanel.mail.transportSecurity=Transport security
SystemConfigPanel.mail.username=Username
SystemConfigPanel.misc.enableExperimentalCode=Enable experimental code
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Filename
SystemConfigPanel.notification.redirectToFile=Redirect to file
SystemConfigPanel.title.accountSynchronization=Global account synchronization settings
Expand Down Expand Up @@ -3676,6 +3676,7 @@ PageAssignmentsList.submitButton=Submit
PageAssignmentsList.resolveConflicts=Resolve conflicts
PageAssignmentsList.commentHere=Comment here...
PageAssignmentsList.requestComment=Request comment (optional)
PageAssignmentsList.saveAssignmentsError=Could not save assignments. Reason:
AssignmentShoppingCartPanel.treeTitle=Role catalog
AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
AssignmentViewType.ROLE_TYPE=All roles view
Expand Down Expand Up @@ -3979,3 +3980,4 @@ pageAdminFocus.dataProtection=Data protection
PageInternals.title.cache=Caches
PageInternals.tab.cache=Cache management
InternalsCachePanel.button.clearCaches=Clear caches
PageAccountActivation.user.not.found=Unexpected problem occurs. Please contact system administrator.
3,983 changes: 3,983 additions & 0 deletions gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions gui/admin-gui/src/main/resources/localization/locale.properties
View file
Expand Up @@ -37,6 +37,9 @@ es.flag=es
fi.name=Suomi
fi.flag=fi

fr.name=Fran\u00E7ais
fr.flag=fr

hu.name=Magyar
hu.flag=hu

Expand Down
2 changes: 1 addition & 1 deletion infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
View file
Expand Up @@ -76,7 +76,7 @@ public GreaterFilter<T> clone() {

@Override
protected String getFilterName() {
return "GREATER";
return isEquals() ? "GREATER-OR-EQUAL" : "GREATER";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
View file
Expand Up @@ -75,7 +75,7 @@ public LessFilter<T> clone() {

@Override
protected String getFilterName() {
return "LESS";
return isEquals() ? "LESS-OR-EQUAL" : "LESS";
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
View file
Expand Up @@ -332,7 +332,8 @@ public String debugDump(int indent) {
StringBuilder sb = new StringBuilder();
DebugUtil.indentDebugDump(sb, indent);
sb.append(getFilterName()).append(":");
return debugDump(indent, sb);
debugDump(indent, sb);
return sb.toString();
}

@Override
Expand All @@ -344,7 +345,7 @@ public String toString() {

protected abstract String getFilterName();

protected String debugDump(int indent, StringBuilder sb) {
protected void debugDump(int indent, StringBuilder sb) {
sb.append("\n");
DebugUtil.indentDebugDump(sb, indent+1);
sb.append("PATH: ");
Expand Down Expand Up @@ -401,8 +402,6 @@ protected String debugDump(int indent, StringBuilder sb) {
sb.append("MATCHING: ");
sb.append(matchingRule);
}

return sb.toString();
}

protected String toString(StringBuilder sb){
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/main/resources/localization/schema_en.properties
View file
Expand Up @@ -689,4 +689,4 @@ relation.owner=owner
relation.consent=consent
AbstractCredentialType.forceChange=Force change on next login
PasswordType.value=Value
AdminGuiConfigurationType.enableExperimentalFeatures=Enable GUI experimental features
AdminGuiConfigurationType.enableExperimentalFeature=Enable GUI experimental features

0 comments on commit b30b119

Please sign in to comment.