syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreapatrice...@apache.org
Subject [syncope] branch 2_1_X updated: fixed last next button when UR mgmt is active, fixed failing enduser tests
Date Fri, 07 Jun 2019 08:00:19 GMT
This is an automated email from the ASF dual-hosted git repository.

andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 0ee29df  fixed last next button when UR mgmt is active, fixed failing enduser tests
0ee29df is described below

commit 0ee29df22c8c82654103070ba14ef6a6b6f855f0
Author: Andrea Patricelli <andreapatricelli@apache.org>
AuthorDate: Fri Jun 7 09:59:44 2019 +0200

    fixed last next button when UR mgmt is active, fixed failing enduser tests
---
 .../META-INF/resources/app/js/controllers/UserController.js        | 7 +++----
 .../resources/META-INF/resources/app/views/user-credentials.html   | 4 ++--
 .../META-INF/resources/app/views/user-derived-schemas.html         | 4 ++--
 .../resources/META-INF/resources/app/views/user-form-finish.html   | 4 ++--
 .../main/resources/META-INF/resources/app/views/user-groups.html   | 4 ++--
 .../resources/META-INF/resources/app/views/user-plain-schemas.html | 4 ++--
 .../main/resources/META-INF/resources/app/views/user-requests.html | 4 ++--
 .../resources/META-INF/resources/app/views/user-resources.html     | 4 ++--
 .../META-INF/resources/app/views/user-virtual-schemas.html         | 4 ++--
 fit/enduser-reference/src/test/resources/tests/abstract.js         | 4 ++++
 fit/enduser-reference/src/test/resources/tests/edit.js             | 2 ++
 11 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index d997542..d4e7022 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -23,11 +23,10 @@
 
 angular.module("self").controller("UserController", ['$scope', '$rootScope', '$location',
"$state",
   'UserSelfService', 'SchemaService', 'RealmService', 'ResourceService', 'SecurityQuestionService',
-  'GroupService', 'AnyService', 'BpmnProcessService', 'UserRequestsService', 'UserUtil',
'GenericUtil',
-  'ValidationExecutor', '$translate', '$filter',
+  'GroupService', 'AnyService', 'UserUtil', 'GenericUtil', 'ValidationExecutor', '$translate',
'$filter',
   function ($scope, $rootScope, $location, $state, UserSelfService, SchemaService, RealmService,
-          ResourceService, SecurityQuestionService, GroupService, AnyService, BpmnProcessService,
UserRequestsService,
-          UserUtil, GenericUtil, ValidationExecutor, $translate, $filter) {
+          ResourceService, SecurityQuestionService, GroupService, AnyService, UserUtil, GenericUtil,

+          ValidationExecutor, $translate, $filter) {
 
     $scope.user = {};
     $scope.confirmPassword = {
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
index 68d442c..958659a 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
@@ -76,9 +76,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="credentials"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="credentials"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="credentials"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="credentials"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
index 718fb99..0187280 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
@@ -30,9 +30,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="derivedSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="derivedSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="derivedSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="derivedSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
index 9f01174..fcc6cfa 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
@@ -31,9 +31,9 @@ under the License.
   </div>
   <div class="col-xs-9">
     <div id="navButtons" class="col-xs-10 float-left">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="finish"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="finish"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="finish"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="finish"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="col-xs-2 float-right p-0">
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
index 73a1e88..062a543 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
@@ -43,9 +43,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="groups"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="groups"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="groups"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="groups"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
index e7ae2b9..83861c0 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
@@ -30,9 +30,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="plainSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="plainSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="plainSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="plainSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-requests.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-requests.html
index bc7aaa9..519496e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-requests.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-requests.html
@@ -30,9 +30,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="userRequests"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="userRequests"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="userRequests"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="userRequests"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
index 9d09da1..43d7479 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
@@ -30,9 +30,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="resources"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="resources"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="resources"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="resources"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
index e688043..d49ac8c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
@@ -30,9 +30,9 @@ under the License.
   <div class="col-xs-9">
     <div id="navButtons" class="float-left"
          ng-class="(!createMode || (createMode && endReached)) ? 'col-xs-10' : 'col-xs-12'">
-      <navigation-buttons-partial ng-show="createMode" base="create" current="virtualSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="createMode" base="create" current="virtualSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
-      <navigation-buttons-partial ng-show="!createMode" base="update" current="virtualSchemas"
wizard="{{wizard}}">
+      <navigation-buttons-partial ng-show="!createMode" base="update" current="virtualSchemas"
wizard="{{createMode ? creationWizard : wizard}}">
       </navigation-buttons-partial>
     </div>
     <div class="float-right p-0" 
diff --git a/fit/enduser-reference/src/test/resources/tests/abstract.js b/fit/enduser-reference/src/test/resources/tests/abstract.js
index 8895eae..6ee6c34 100644
--- a/fit/enduser-reference/src/test/resources/tests/abstract.js
+++ b/fit/enduser-reference/src/test/resources/tests/abstract.js
@@ -25,6 +25,10 @@ exports.doNext = function () {
   element.all(by.id('next')).last().click();
 };
 
+exports.doFinish = function () {
+  element.all(by.id('finish')).last().click();
+};
+
 exports.doCancel = function () {
   element.all(by.id('cancel')).last().click();
 };
diff --git a/fit/enduser-reference/src/test/resources/tests/edit.js b/fit/enduser-reference/src/test/resources/tests/edit.js
index 4d416e7..823b912 100644
--- a/fit/enduser-reference/src/test/resources/tests/edit.js
+++ b/fit/enduser-reference/src/test/resources/tests/edit.js
@@ -88,6 +88,8 @@ describe('syncope enduser user edit', function () {
     abstract.doNext();
     //Resources
     abstract.doNext();
+    //Go directly to finish
+    abstract.doFinish();
     //Captcha
     abstract.waitSpinner();
     element.all(by.id('save')).last().click();


Mime
View raw message