You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/06/09 16:00:24 UTC
[3/4] syncope git commit: [SYNCOPE-1067] Management from Admin Console
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
deleted file mode 100644
index 486e33b..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
+++ /dev/null
@@ -1,36 +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.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:extend>
- <section class="content-header">
- <h1> </h1>
- <ol class="breadcrumb">
- <li><a wicket:id="dashboardBr"><i class="fa fa-dashboard"></i> <wicket:message key="dashboard"/></a></li>
- <li class="active"><wicket:message key="configuration"/></li>
- <li class="active"><wicket:message key="roles"/></li>
- </ol>
- </section>
-
- <section class="content" wicket:id="content">
- <div class="box">
- <div class="box-body" wicket:id="rolesPanel"/>
- </div>
- </section>
- </wicket:extend>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
deleted file mode 100644
index 6a40284..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
+++ /dev/null
@@ -1,17 +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.
-add=Create new Role
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
deleted file mode 100644
index ba0237a..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
+++ /dev/null
@@ -1,17 +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.
-add=Crea un nuovo Ruolo
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
deleted file mode 100644
index c150538..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
+++ /dev/null
@@ -1,17 +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.
-add=Cria um novo fun\u00e7\u00e3o
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_ru.properties
deleted file mode 100644
index a933784..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_ru.properties
+++ /dev/null
@@ -1,19 +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.
-#
-# add=Создать роль
-add=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.properties
new file mode 100644
index 0000000..13fdcf9
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.properties
@@ -0,0 +1,18 @@
+# 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.
+any.edit=Edit ${key}
+any.new=New Dynamic Realm
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_it.properties
new file mode 100644
index 0000000..3edddc9
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_it.properties
@@ -0,0 +1,18 @@
+# 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.
+any.edit=Modifica ${key}
+any.new=Nuovo Realm dinamico
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_pt_BR.properties
new file mode 100644
index 0000000..4df146d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_pt_BR.properties
@@ -0,0 +1,18 @@
+# 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.
+any.edit=Alterar ${key}
+any.new=Novo Realm din\u00e2mico
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_ru.properties
new file mode 100644
index 0000000..90d72ba
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel_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.
+#
+any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${key}
+any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c Dynamic Realm
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmModalPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmModalPanel.html
new file mode 100644
index 0000000..3200d9d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DynRealmModalPanel.html
@@ -0,0 +1,26 @@
+<!--
+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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div class="form-group">
+ <span wicket:id="key"/>
+ <div wicket:id="cond"/>
+ </div>
+ </wicket:extend>
+</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel.properties
index d656ca5..3a27730 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel.properties
@@ -17,4 +17,3 @@
any.edit=Edit role ${roleTO.key}
any.new=New role
role.members=Role '${key}' members
-dynRealms=Dynamic Realms
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_it.properties
index 34ba4ef..04a466e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_it.properties
@@ -17,4 +17,3 @@
any.edit=Modifica ruolo ${roleTO.key}
any.new=Nuovo ruolo
role.members=Utenti membri del rulo '${key}'
-dynRealms=Realm dinamici
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_pt_BR.properties
index 4e55e7e..1de6e43 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_pt_BR.properties
@@ -17,4 +17,3 @@
any.edit=Alterar fun\u00e7\u00e3o ${roleTO.key}
any.new=Novo fun\u00e7\u00e3o
role.members=Role '${key}' members
-dynRealms=Dynamic Realms
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_ru.properties
index 61dd821..b292ea7 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/RoleDirectoryPanel_ru.properties
@@ -18,4 +18,3 @@
any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u043e\u043b\u044c ${roleTO.key}
any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c
role.members=\u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438 \u0440\u043e\u043b\u0438 '${key}'
-dynRealms=Dynamic Realms
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
index 653799e..3a5b769 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.html
@@ -18,7 +18,7 @@ under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div class="col-xs-12">
+ <div class="col-xs-12" wicket:id="groupsContainer">
<div class="box">
<div class="box-header">
<h3 class="box-title">
@@ -31,7 +31,7 @@ under the License.
</div>
</div>
- <div class="col-xs-12">
+ <div class="col-xs-12" wicket:id="dyngroupsContainer">
<div class="box">
<div class="box-header">
<h3 class="box-title">
@@ -43,5 +43,18 @@ under the License.
</div>
</div>
</div>
+
+ <div class="col-xs-12">
+ <div class="box">
+ <div class="box-header">
+ <h3 class="box-title">
+ <wicket:message key="dynrealms.palette">[DYNAMIC REALMS]</wicket:message>
+ </h3>
+ </div>
+ <div class="box-body">
+ <span wicket:id="dynrealms">[DYNAMIC GROUPS]</span>
+ </div>
+ </div>
+ </div>
</wicket:panel>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.properties
index 295f1ac..fe2a381 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups.properties
@@ -17,3 +17,4 @@
groups.palette=Groups
dyngroups.palette=Dynamic groups
palette.available=Available (limited to the first 30 results)
+dynrealms.palette=Dynamic Realms
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_it.properties
index aa56e3c..5c23108 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_it.properties
@@ -17,3 +17,4 @@
groups.palette=Gruppi
dyngroups.palette=Gruppi dinamici
palette.available=Disponibili (limitato ai primi 30 risultati)
+dynrealms.palette=Realms dinamici
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_pt_BR.properties
index b058c3d..2a231b4 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_pt_BR.properties
@@ -17,3 +17,4 @@
groups.palette=Grupos
dyngroups.palette=Grupos din\u00e2micos
palette.available=Available (limited to the first 30 results)
+dynrealms.palette=Realms din\u00e2micos
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_ru.properties
index 4507518..43c912f 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/Groups_ru.properties
@@ -18,3 +18,4 @@
groups.palette=\u0413\u0440\u0443\u043f\u043f\u044b
dyngroups.palette=\u0414\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0433\u0440\u0443\u043f\u043f\u044b
palette.available=Available (limited to the first 30 results)
+dynrealms.palette=Dynamic Realms
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html
new file mode 100644
index 0000000..c55493c
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder$DynRealms.html
@@ -0,0 +1,28 @@
+<!--
+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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <head><title></title></head>
+ <body>
+ <wicket:panel>
+ <div class="form-group">
+ <span wicket:id="dynRealms">[DYNAMIC REALMS]</span>
+ </div>
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/DynRealmDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/DynRealmDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/DynRealmDataBinderImpl.java
index 56d7903..9a61f17 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/DynRealmDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/DynRealmDataBinderImpl.java
@@ -48,8 +48,11 @@ public class DynRealmDataBinderImpl implements DynRealmDataBinder {
public DynRealm update(final DynRealm dynRealm, final DynRealmTO dynRealmTO) {
dynRealm.setKey(dynRealmTO.getKey());
- SearchCond cond = SearchCondConverter.convert(dynRealmTO.getCond());
- if (!cond.isValid()) {
+ SearchCond cond = null;
+ if (dynRealmTO.getCond() != null) {
+ cond = SearchCondConverter.convert(dynRealmTO.getCond());
+ }
+ if (cond == null || !cond.isValid()) {
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidSearchExpression);
sce.getElements().add(dynRealmTO.getCond());
throw sce;
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/fit/console-reference/src/main/resources/console.properties
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties
index 4ce2e9b..7515275 100644
--- a/fit/console-reference/src/main/resources/console.properties
+++ b/fit/console-reference/src/main/resources/console.properties
@@ -34,6 +34,7 @@ activitiModelerDirectory=${activiti-modeler.directory}
reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97
+page.administration=org.apache.syncope.client.console.pages.Administration
page.dashboard=org.apache.syncope.client.console.pages.Dashboard
page.realms=org.apache.syncope.client.console.pages.Realms
page.topology=org.apache.syncope.client.console.topology.Topology
@@ -43,7 +44,6 @@ page.audit=org.apache.syncope.client.console.pages.Audit
page.logs=org.apache.syncope.client.console.pages.Logs
page.securityquestions=org.apache.syncope.client.console.pages.SecurityQuestions
page.types=org.apache.syncope.client.console.pages.Types
-page.roles=org.apache.syncope.client.console.pages.Roles
page.policies=org.apache.syncope.client.console.pages.Policies
page.notifications=org.apache.syncope.client.console.pages.Notifications
page.parameters=org.apache.syncope.client.console.pages.Parameters
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
index c6b1aaf..5c80cca 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
@@ -25,7 +25,7 @@ import org.apache.syncope.client.console.pages.Notifications;
import org.apache.syncope.client.console.pages.Policies;
import org.apache.syncope.client.console.pages.Realms;
import org.apache.syncope.client.console.pages.Reports;
-import org.apache.syncope.client.console.pages.Roles;
+import org.apache.syncope.client.console.pages.Administration;
import org.apache.syncope.client.console.pages.SecurityQuestions;
import org.apache.syncope.client.console.pages.Types;
import org.apache.syncope.client.console.pages.Workflow;
@@ -84,8 +84,8 @@ public class AjaxBrowseITCase extends AbstractConsoleITCase {
TESTER.clickLink("body:configurationLI:configurationUL:typesLI:types");
TESTER.assertRenderedPage(Types.class);
- TESTER.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
- TESTER.assertRenderedPage(Roles.class);
+ TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration");
+ TESTER.assertRenderedPage(Administration.class);
TESTER.clickLink("body:configurationLI:configurationUL:policiesLI:policies");
TESTER.assertRenderedPage(Policies.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
index 54d8348..65d6f3f 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.pages.Roles;
+import org.apache.syncope.client.console.pages.Administration;
import org.apache.wicket.Component;
import org.apache.wicket.util.tester.FormTester;
import org.junit.Before;
@@ -34,53 +34,58 @@ public class RolesITCase extends AbstractConsoleITCase {
@Before
public void login() {
doLogin(ADMIN_UNAME, ADMIN_PWD);
- TESTER.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
- TESTER.assertRenderedPage(Roles.class);
+ TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration");
+ TESTER.assertRenderedPage(Administration.class);
}
private void createRole(final String name) {
- TESTER.clickLink("body:content:rolesPanel:container:content:add");
+ TESTER.clickLink("body:content:tabbedPanel:panel:container:content:add");
- TESTER.assertComponent("body:content:rolesPanel:outerObjectsRepeater:0:outer", Modal.class);
+ TESTER.assertComponent("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer", Modal.class);
- FormTester formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ FormTester formTester = TESTER.newFormTester(
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:key:textField", name);
formTester.submit("content:form:buttons:next");
- formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:entitlements:paletteField:recorder",
"WORKFLOW_DEF_READ,NOTIFICATION_UPDATE,RELATIONSHIPTYPE_READ,RELATIONSHIPTYPE_LIST");
formTester.submit("content:form:buttons:next");
- formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
+ formTester.submit("content:form:buttons:next");
+
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();
- TESTER.clickLink("body:configurationLI:configurationUL:rolesLI:roles");
+ TESTER.clickLink("body:configurationLI:configurationUL:administrationLI:administration");
}
@Test
public void read() {
- Component result = findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
+ Component result = findComponentByProp(KEY, "body:content:tabbedPanel:panel:container:content:searchContainer:"
+ "resultTable:tablePanel:groupForm:checkgroup:dataTable", "Other");
assertNotNull(result);
TESTER.executeAjaxEvent(result.getPageRelativePath(), Constants.ON_CLICK);
- TESTER.clickLink("body:content:rolesPanel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
- + "container:actions:actions:actionRepeater:2:action:action");
+ TESTER.clickLink("body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:"
+ + "togglePanelContainer:container:actions:actions:actionRepeater:2:action:action");
TESTER.assertModelValue(
- "body:content:rolesPanel:outerObjectsRepeater:5:outer:dialog:header:header-label",
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:5:outer:dialog:header:header-label",
"Role 'Other' members");
- assertNotNull(findComponentByProp("username", "body:content:rolesPanel:outerObjectsRepeater:5:outer:form:"
+ assertNotNull(findComponentByProp("username",
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:5:outer:form:"
+ "content:searchResult:container:content:searchContainer:resultTable:tablePanel:groupForm:"
+ "checkgroup:dataTable", "rossini"));
TESTER.executeAjaxEvent(
- "body:content:rolesPanel:outerObjectsRepeater:5:outer:dialog:footer:buttons:0:button",
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:5:outer:dialog:footer:buttons:0:button",
Constants.ON_CLICK);
}
@@ -92,25 +97,27 @@ public class RolesITCase extends AbstractConsoleITCase {
@Test
public void update() {
createRole("updateRole");
- Component result = findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
+ Component result = findComponentByProp(KEY, "body:content:tabbedPanel:panel:container:content:searchContainer:"
+ "resultTable:tablePanel:groupForm:checkgroup:dataTable", "updateRole");
assertNotNull(result);
TESTER.executeAjaxEvent(result.getPageRelativePath(), Constants.ON_CLICK);
- TESTER.clickLink("body:content:rolesPanel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ TESTER.clickLink(
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ "container:actions:actions:actionRepeater:0:action:action");
- FormTester formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ FormTester formTester = TESTER.newFormTester(
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:key:textField", "updateRole");
formTester.submit("content:form:buttons:next");
- formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:entitlements:paletteField:recorder",
"WORKFLOW_DEF_READ,NOTIFICATION_UPDATE");
formTester.submit("content:form:buttons:next");
- formTester = TESTER.newFormTester("body:content:rolesPanel:outerObjectsRepeater:0:outer:form");
+ formTester = TESTER.newFormTester("body:content:tabbedPanel:panel:outerObjectsRepeater:0:outer:form");
formTester.submit("content:form:buttons:finish");
TESTER.assertInfoMessages("Operation executed successfully");
@@ -120,7 +127,7 @@ public class RolesITCase extends AbstractConsoleITCase {
@Test
public void delete() {
createRole("deleteRole");
- Component result = findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
+ Component result = findComponentByProp(KEY, "body:content:tabbedPanel:panel:container:content:searchContainer:"
+ "resultTable:tablePanel:groupForm:checkgroup:dataTable", "deleteRole");
assertNotNull(result);
@@ -129,17 +136,17 @@ public class RolesITCase extends AbstractConsoleITCase {
TESTER.getRequest().addParameter("confirm", "true");
TESTER.clickLink(TESTER.getComponentFromLastRenderedPage(
- "body:content:rolesPanel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ "container:actions:actions:actionRepeater:4:action:action"));
TESTER.executeAjaxEvent(TESTER.getComponentFromLastRenderedPage(
- "body:content:rolesPanel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ "body:content:tabbedPanel:panel:outerObjectsRepeater:1:outer:container:content:togglePanelContainer:"
+ "container:actions:actions:actionRepeater:4:action:action"), "onclick");
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();
- assertNull(findComponentByProp(KEY, "body:content:rolesPanel:container:content:searchContainer:"
+ assertNull(findComponentByProp(KEY, "body:content:tabbedPanel:panel:container:content:searchContainer:"
+ "resultTable:tablePanel:groupForm:checkgroup:dataTable", "deleteRole"));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
index fe5f3ab..efc690e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
@@ -192,7 +192,7 @@ public class UsersITCase extends AbstractConsoleITCase {
formTester = TESTER.newFormTester(TAB_PANEL + "outerObjectsRepeater:0:outer:form:content:form");
assertNotNull(formTester);
- formTester.setValue("view:groups:paletteField:recorder", "additional,root,otherchild");
+ formTester.setValue("view:groupsContainer:groups:paletteField:recorder", "additional,root,otherchild");
TESTER.executeAjaxEvent(
TAB_PANEL + "outerObjectsRepeater:0:outer:form:content:form:buttons:next", Constants.ON_CLICK);
@@ -240,7 +240,7 @@ public class UsersITCase extends AbstractConsoleITCase {
formTester = TESTER.newFormTester(TAB_PANEL + "outerObjectsRepeater:0:outer:form:content:form");
assertNotNull(formTester);
- formTester.setValue("view:groups:paletteField:recorder", "root,otherchild");
+ formTester.setValue("view:groupsContainer:groups:paletteField:recorder", "root,otherchild");
TESTER.executeAjaxEvent(
TAB_PANEL + "outerObjectsRepeater:0:outer:form:content:form:buttons:finish", Constants.ON_CLICK);
http://git-wip-us.apache.org/repos/asf/syncope/blob/52bd7eb0/fit/core-reference/src/test/resources/console.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/resources/console.properties b/fit/core-reference/src/test/resources/console.properties
index 63ed279..93f812c 100644
--- a/fit/core-reference/src/test/resources/console.properties
+++ b/fit/core-reference/src/test/resources/console.properties
@@ -34,6 +34,7 @@ activitiModelerDirectory=${activiti-modeler.directory}
reconciliationReportKey=c3520ad9-179f-49e7-b315-d684d216dd97
+page.administration=org.apache.syncope.client.console.pages.Administration
page.dashboard=org.apache.syncope.client.console.pages.Dashboard
page.realms=org.apache.syncope.client.console.pages.Realms
page.topology=org.apache.syncope.client.console.topology.Topology
@@ -43,7 +44,6 @@ page.audit=org.apache.syncope.client.console.pages.Audit
page.logs=org.apache.syncope.client.console.pages.Logs
page.securityquestions=org.apache.syncope.client.console.pages.SecurityQuestions
page.types=org.apache.syncope.client.console.pages.Types
-page.roles=org.apache.syncope.client.console.pages.Roles
page.policies=org.apache.syncope.client.console.pages.Policies
page.notifications=org.apache.syncope.client.console.pages.Notifications
page.parameters=org.apache.syncope.client.console.pages.Parameters