[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 <[email protected]> Authored: Sat Nov 25 11:49:57 2017 +0100 Committer: fmartelli <[email protected]> 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
