You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2017/11/25 10:50:24 UTC
[1/3] syncope git commit: fix for toggle panel bundle names
Repository: syncope
Updated Branches:
refs/heads/2_0_X 0cf558895 -> e7daf95ac
fix for toggle panel bundle names
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bdccedf5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bdccedf5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bdccedf5
Branch: refs/heads/2_0_X
Commit: bdccedf518162fbc458aa666554f91986af44c3e
Parents: 0cf5588
Author: fmartelli <fa...@gmail.com>
Authored: Sat Nov 25 11:40:25 2017 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Sat Nov 25 11:40:25 2017 +0100
----------------------------------------------------------------------
.../console/panels/TogglePanel_it.properties | 1 +
.../console/panels/TogglePanel_pt_BR.properties | 19 +++++++++++++++++++
.../console/panels/TogglePanel_ru.properties | 19 +++++++++++++++++++
3 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bdccedf5/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it.properties
index 079a959..520ad10 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it.properties
@@ -16,3 +16,4 @@
# under the License.
copy_to_clipboard.feedback=Chiave copiata negli appunti!
copy_to_clipboard.title=Clicca per copiare la chiave negli appunti
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/bdccedf5/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_pt_BR.properties
new file mode 100644
index 0000000..2f6931a
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_pt_BR.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+copy_to_clipboard.feedback=Chave copiada para a \u00e1rea de transfer\u00eancia!
+copy_to_clipboard.title=Clique para copiar a tecla para a \u00e1rea de transfer\u00eancia
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/bdccedf5/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_ru.properties
new file mode 100644
index 0000000..ea33ddd
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_ru.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+copy_to_clipboard.feedback=\u041a\u043b\u044e\u0447 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430!
+copy_to_clipboard.title=\u041d\u0430\u0436\u043c\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043b\u044e\u0447 \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430
+
[2/3] syncope git commit: fix realm and entity console access
permissions
Posted by fm...@apache.org.
fix realm and entity console access permissions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/98cc9b1c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/98cc9b1c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/98cc9b1c
Branch: refs/heads/2_0_X
Commit: 98cc9b1cbf91b6732d6fd5f62239c72ffba5f197
Parents: bdccedf
Author: fmartelli <fa...@gmail.com>
Authored: Sat Nov 25 11:41:28 2017 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Sat Nov 25 11:41:28 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/syncope/client/console/panels/Realm.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/98cc9b1c/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index fe708f8..7e6e998 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -166,13 +166,12 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
}
});
- final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo =
- FormLayoutInfoUtils.fetch(CollectionUtils.collect(anyTypes, EntityTOUtils.keyTransformer()));
+ final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo
+ = FormLayoutInfoUtils.fetch(CollectionUtils.collect(anyTypes, EntityTOUtils.keyTransformer()));
for (final AnyTypeTO anyType : anyTypes) {
tabs.add(new ITabComponent(
- new Model<>(anyType.getKey()),
- StandardEntitlement.ANYTYPE_READ, String.format("%s_SEARCH", anyType)) {
+ new Model<>(anyType.getKey()), String.format("%s_SEARCH", anyType.getKey())) {
private static final long serialVersionUID = 1169585538404171118L;
[3/3] syncope git commit: [SYNCOPE-1239] fix plain attr value
specification in case of this step is the last one
Posted by fm...@apache.org.
[SYNCOPE-1239] fix plain attr value specification in case of this step is the last one
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e7daf95a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e7daf95a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e7daf95a
Branch: refs/heads/2_0_X
Commit: e7daf95ac97aa65af85fa74af6c651d341fea44c
Parents: 98cc9b1
Author: fmartelli <fa...@gmail.com>
Authored: Sat Nov 25 11:49:57 2017 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Sat Nov 25 11:49:57 2017 +0100
----------------------------------------------------------------------
.../client/console/wizards/any/PlainAttrs.java | 2 +-
.../panels/TogglePanel_it_pt_BR.properties | 18 ------------------
.../console/panels/TogglePanel_it_ru.properties | 18 ------------------
3 files changed, 1 insertion(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e7daf95a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 3064d3d..a778026 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -181,7 +181,7 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
// is important to set the schema info only after values setting
attrTO.setSchemaInfo(schema);
} else {
- attrTO.getValues().addAll(attrMap.get(schema.getKey()).getValues());
+ attrTO = attrMap.get(schema.getKey());
}
attrs.add(attrTO);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e7daf95a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_pt_BR.properties
deleted file mode 100644
index d3d50f3..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_pt_BR.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-copy_to_clipboard.feedback=Chave copiada para a \u00e1rea de transfer\u00eancia!
-copy_to_clipboard.title=Clique para copiar a tecla para a \u00e1rea de transfer\u00eancia
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/e7daf95a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_ru.properties
deleted file mode 100644
index 9d158d7..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/TogglePanel_it_ru.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-copy_to_clipboard.feedback=\u041a\u043b\u044e\u0447 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430!
-copy_to_clipboard.title=\u041d\u0430\u0436\u043c\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043b\u044e\u0447 \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430
\ No newline at end of file